shiyang / regional-platform

Download as
Browse Code »

Commit 6206a0dfcfcf867dd4c9136deee8b27028229376

Authored by rui.zhang
1 parent 7615d4f7e8
Exists in master and in 1 other branch nobuildprocess

platform permission 

add paging

Showing 2 changed files with 313 additions and 27 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 6206a0d
... ... @@ -112,15 +112,13 @@
112 112  
113 113 }
114 114 /**
115   - * 创建角色
  115 + * 创建用户角色
116 116 * @param response
117   - * @param type 类型
118 117 */
119   - @RequestMapping(value = "/roles",method = RequestMethod.POST)
  118 + @RequestMapping(value = "/userRoles",method = RequestMethod.POST)
120 119 @TokenRequired
121   - public void addRoles(HttpServletResponse response,
  120 + public void addUserRoles(HttpServletResponse response,
122 121 HttpServletRequest request,
123   - @RequestParam(value = "type")Integer type,
124 122 @RequestParam(value = "name")String name,
125 123 @RequestParam(value = "enable")Integer enable,
126 124 @RequestParam(value = "remarks", required = false)String remarks,
127 125  
... ... @@ -130,13 +128,13 @@
130 128 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
131 129 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
132 130  
133   - if (type == null || StringUtils.isBlank(name) || null == users) {
  131 + if ( StringUtils.isBlank(name) || null == users) {
134 132 ResultUtils.buildParameterErrorResultAndWrite(response);
135 133 return;
136 134 }
137 135  
138 136 Roles roles = new Roles();
139   - roles.setType(type);
  137 + roles.setType(1);
140 138 roles.setName(name);
141 139 roles.setEnable(enable);
142 140 roles.setRemarks(remarks);
143 141  
... ... @@ -151,7 +149,46 @@
151 149 ResultUtils.buildSuccessResultAndWrite(response);
152 150 }
153 151  
  152 +
154 153 /**
  154 + * 创建管理员角色
  155 + * @param response
  156 + */
  157 + @RequestMapping(value = "/adminRoles",method = RequestMethod.POST)
  158 + @TokenRequired
  159 + public void addAdminRoles(HttpServletResponse response,
  160 + HttpServletRequest request,
  161 + @RequestParam(value = "name")String name,
  162 + @RequestParam(value = "enable")Integer enable,
  163 + @RequestParam(value = "remarks", required = false)String remarks,
  164 + @RequestParam(value = "shortCode", required = false)String shortCode) {
  165 +
  166 + //获取登录用户
  167 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  168 + Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  169 +
  170 + if (StringUtils.isBlank(name) || null == users) {
  171 + ResultUtils.buildParameterErrorResultAndWrite(response);
  172 + return;
  173 + }
  174 +
  175 + Roles roles = new Roles();
  176 + roles.setType(0);
  177 + roles.setName(name);
  178 + roles.setEnable(enable);
  179 + roles.setRemarks(remarks);
  180 + roles.setShortcode(shortCode);
  181 + roles.setYn(YnEnums.YES.getId());
  182 + roles.setPublishId(users.getId());
  183 + roles.setPublishName(users.getName());
  184 + roles.setModified(new Date());
  185 + roles.setCreated(new Date());
  186 + rolesService.addRoles(roles);
  187 +
  188 + ResultUtils.buildSuccessResultAndWrite(response);
  189 + }
  190 +
  191 + /**
155 192 * 角色修改
156 193 */
157 194 @RequestMapping(value = "/roles/{id}",method = RequestMethod.PUT)
158 195  
159 196  
... ... @@ -255,12 +292,11 @@
255 292 /**
256 293 * 获取列表
257 294 */
258   - @RequestMapping(value = "/roles", method = RequestMethod.GET)
  295 + @RequestMapping(value = "/userRoles", method = RequestMethod.GET)
259 296 @ResponseBody
260 297 @TokenRequired
261   - public void getPermissions(HttpServletResponse response,
  298 + public void getUserList(HttpServletResponse response,
262 299 @RequestParam(value = "keyword",required = false) String keyword,
263   - @RequestParam(value = "type",required = false) Integer type,
264 300 @RequestParam(value = "page",required = false) Integer page,
265 301 @RequestParam(value = "limit",required = false) Integer limit,
266 302 @RequestParam(value = "orgId", required = false) Integer orgId) {
... ... @@ -272,7 +308,36 @@
272 308 rolesQuery.setNeed("true");
273 309 rolesQuery.setSort("id desc");
274 310 rolesQuery.setYn(YnEnums.YES.getId());
275   - rolesQuery.setType(type);
  311 + rolesQuery.setType(1);
  312 + rolesQuery.setName(keyword);
  313 + rolesQuery.setPage(page);
  314 + rolesQuery.setLimit(limit);
  315 + //TODO 这里查询未完成 模糊查询
  316 +
  317 + List<Roles> roles = rolesService.queryRoles(rolesQuery);
  318 + ResultUtils.buildSuccessResultAndWrite(response, roles);
  319 + }
  320 +
  321 +
  322 + /**
  323 + * 获取列表
  324 + */
  325 + @RequestMapping(value = "/adminRoles", method = RequestMethod.GET)
  326 + @ResponseBody
  327 + @TokenRequired
  328 + public void getAdminList(HttpServletResponse response,
  329 + @RequestParam(value = "keyword",required = false) String keyword,
  330 + @RequestParam(value = "page",required = false) Integer page,
  331 + @RequestParam(value = "limit",required = false) Integer limit) {
  332 +
  333 + limit = limit == null ? 10 : limit;
  334 + page = page == null ? 1 : page;
  335 +
  336 + RolesQuery rolesQuery = new RolesQuery();
  337 + rolesQuery.setNeed("true");
  338 + rolesQuery.setSort("id desc");
  339 + rolesQuery.setYn(YnEnums.YES.getId());
  340 + rolesQuery.setType(0);
276 341 rolesQuery.setName(keyword);
277 342 rolesQuery.setPage(page);
278 343 rolesQuery.setLimit(limit);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 6206a0d
... ... @@ -54,16 +54,53 @@
54 54  
55 55  
56 56  
  57 + /**
  58 + * 获取管理员列表
  59 + */
  60 + @RequestMapping(value = "/admins", method = RequestMethod.GET)
  61 + @ResponseBody
  62 + @TokenRequired
  63 + public void getAdminList(HttpServletResponse response,
  64 + @RequestParam(value = "keyword", required = false) String keyword,
  65 + @RequestParam(value = "rolesId", required = false) Integer rolesId,
  66 + @RequestParam(value = "page", required = false) Integer page,
  67 + @RequestParam(value = "limit", required = false) Integer limit) {
57 68  
  69 + limit = limit == null ? 10 : limit;
  70 + page = page == null ? 1 : page;
58 71  
  72 + UsersQuery usersQuery = new UsersQuery();
  73 + usersQuery.setNeed("true");
  74 + usersQuery.setSort("id desc");
  75 + usersQuery.setYn(YnEnums.YES.getId());
  76 + usersQuery.setName(keyword);
  77 + usersQuery.setType(0);
  78 + usersQuery.setPage(page);
  79 + usersQuery.setLimit(limit);
  80 + //TODO 这里查询未完成 模糊查询
  81 +
  82 + List<Users> users = usersService.queryUsers(usersQuery);
  83 +
  84 + //设置用户角色信息
  85 + for(Users user : users) {
  86 + user.setRoles(this.getUserRoles(user.getId()));
  87 + user.setOrganization(organizationService.getOrganization(user.getId()));
  88 + user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
  89 + }
  90 +
  91 +
  92 + ResultUtils.buildSuccessResultAndWrite(response, users);
  93 + }
  94 +
  95 +
  96 +
59 97 /**
60   - * 获取列表
  98 + * 获取用户列表
61 99 */
62 100 @RequestMapping(value = "/users", method = RequestMethod.GET)
63 101 @ResponseBody
64 102 @TokenRequired
65 103 public void getPermissions(HttpServletResponse response,
66   - @RequestParam(value = "type") Integer type,
67 104 @RequestParam(value = "keyword", required = false) String keyword,
68 105 @RequestParam(value = "rolesId", required = false) Integer rolesId,
69 106 @RequestParam(value = "page", required = false) Integer page,
... ... @@ -78,7 +115,7 @@
78 115 usersQuery.setSort("id desc");
79 116 usersQuery.setYn(YnEnums.YES.getId());
80 117 usersQuery.setName(keyword);
81   - usersQuery.setType(type);
  118 + usersQuery.setType(1);
82 119 usersQuery.setPage(page);
83 120 usersQuery.setLimit(limit);
84 121 //TODO 这里查询未完成 模糊查询
85 122  
86 123  
... ... @@ -310,9 +347,96 @@
310 347 }
311 348  
312 349  
  350 + /**
  351 + * 添加管理员信息
  352 + */
  353 + @RequestMapping(value = "/admin", method = RequestMethod.POST)
  354 + @TokenRequired
  355 + public void addAdmin(HttpServletResponse response,
  356 + HttpServletRequest request,
  357 + @RequestParam(value = "name", required = false) String name,
  358 + @RequestParam(value = "account", required = false)String account,
  359 + @RequestParam(value = "phone") String phone,
  360 + @RequestParam(value = "enable") Integer enable,
  361 + @RequestParam(value = "remarks", required = false) String remarks,
  362 + @RequestParam(value = "roleIds") String roleIds) {
313 363  
314 364  
  365 + //获取登录用户
  366 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  367 + Users user = usersService.getUsersByLoginCenterId(loginState.getId());
315 368  
  369 +
  370 + if (StringUtils.isBlank(roleIds) ||
  371 + StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user ) {
  372 + ResultUtils.buildParameterErrorResultAndWrite(response);
  373 + return;
  374 + }
  375 +
  376 + if (user != null) {
  377 +
  378 + //检查注册账户是否存在
  379 + UsersQuery usersQuery = new UsersQuery();
  380 + usersQuery.setPhone(phone);
  381 + List<Users> usersList = usersService.queryUsers(usersQuery);
  382 + if (usersList.size() != 0) {
  383 + Map<String, Object> map = new HashMap<>();
  384 + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
  385 + map.put(ResultUtils.ERROR_MSG, "用户已存在");
  386 + writeJson(response, JsonUtil.obj2JsonString(map));
  387 + return;
  388 + }
  389 +
  390 + //准备添加数据
  391 + Users users = new Users();
  392 + users.setType(0);
  393 + users.setName(name);
  394 + users.setAccount(account);
  395 + users.setPhone(phone);
  396 + users.setEnable(enable);
  397 + users.setRemarks(remarks);
  398 + users.setPublishId(user.getId());
  399 + users.setPublishName(user.getName());
  400 + users.setYn(YnEnums.YES.getId());
  401 + users.setModified(new Date());
  402 + users.setCreated(new Date());
  403 + users.setLastLoginTime(new Date());
  404 +// users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
  405 +
  406 + //关联登录中心ID
  407 + Integer loginCenterId = LoginUtil.register(phone, token, typeId);
  408 + if(null == loginCenterId) {
  409 + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, "服务器内部错误");
  410 + return;
  411 + }
  412 + users.setLogincenterId(loginCenterId);
  413 +
  414 + usersService.addUsers(users);
  415 +
  416 +
  417 + //如有角色,则对用户角色中间表新增
  418 + UserRoleMaps userRoleMaps = new UserRoleMaps();
  419 +
  420 + String[] roleArrayIds = roleIds.split(",");
  421 + List<Users> user1 = usersService.queryUsers(usersQuery);
  422 + for (String id : roleArrayIds) {
  423 + Roles roles = rolesService.getRoles(Integer.valueOf(id));
  424 + if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
  425 + continue;
  426 + }
  427 +
  428 + if (user1.get(0).getId() != null) {
  429 + userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
  430 + userRoleMaps.setUserId(user1.get(0).getId());
  431 + userRoleMaps.setYn(YnEnums.YES.getId());
  432 + userRoleMapsService.addUserRoleMaps(userRoleMaps);
  433 + }
  434 + }
  435 + ResultUtils.buildSuccessResultAndWrite(response);
  436 + }
  437 + }
  438 +
  439 +
316 440 /**
317 441 * 添加用户信息
318 442 */
... ... @@ -320,7 +444,6 @@
320 444 @TokenRequired
321 445 public void addUsers(HttpServletResponse response,
322 446 HttpServletRequest request,
323   - @RequestParam(value = "type") Integer type,
324 447 @RequestParam(value = "deptId") Integer deptId,
325 448 @RequestParam(value = "orgId") Integer orgId,
326 449 @RequestParam(value = "name", required = false) String name,
... ... @@ -338,7 +461,7 @@
338 461 Departments departments = departmentsService.getDepartments(deptId);
339 462 Organization organization = organizationService.getOrganization(orgId);
340 463  
341   - if (type == null || StringUtils.isBlank(roleIds) || deptId == null ||
  464 + if ( StringUtils.isBlank(roleIds) || deptId == null ||
342 465 StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments || null == organization) {
343 466 ResultUtils.buildParameterErrorResultAndWrite(response);
344 467 return;
... ... @@ -360,7 +483,7 @@
360 483  
361 484 //准备添加数据
362 485 Users users = new Users();
363   - users.setType(type);
  486 + users.setType(1); //1管理员
364 487 users.setDeptId(deptId);
365 488 users.setOrgId(orgId);
366 489 users.setName(name);
367 490  
368 491  
... ... @@ -393,21 +516,119 @@
393 516 String[] roleArrayIds = roleIds.split(",");
394 517 List<Users> user1 = usersService.queryUsers(usersQuery);
395 518 for (String id : roleArrayIds) {
396   - Roles roles = rolesService.getRoles(Integer.valueOf(id));
397   - if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
398   - continue;
399   - }
  519 + Roles roles = rolesService.getRoles(Integer.valueOf(id));
  520 + if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
  521 + continue;
  522 + }
400 523  
401   - if (user1.get(0).getId() != null) {
402   - userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
403   - userRoleMaps.setUserId(user1.get(0).getId());
404   - userRoleMaps.setYn(YnEnums.YES.getId());
405   - userRoleMapsService.addUserRoleMaps(userRoleMaps);
406   - }
  524 + if (user1.get(0).getId() != null) {
  525 + userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
  526 + userRoleMaps.setUserId(user1.get(0).getId());
  527 + userRoleMaps.setYn(YnEnums.YES.getId());
  528 + userRoleMapsService.addUserRoleMaps(userRoleMaps);
  529 + }
407 530 }
408 531 ResultUtils.buildSuccessResultAndWrite(response);
409 532 }
410 533 }
  534 +
  535 +
  536 +
  537 +// /**
  538 +// * 添加用户信息
  539 +// */
  540 +// @RequestMapping(value = "/users", method = RequestMethod.POST)
  541 +// @TokenRequired
  542 +// public void addUsers(HttpServletResponse response,
  543 +// HttpServletRequest request,
  544 +// @RequestParam(value = "type") Integer type,
  545 +// @RequestParam(value = "deptId") Integer deptId,
  546 +// @RequestParam(value = "orgId") Integer orgId,
  547 +// @RequestParam(value = "name", required = false) String name,
  548 +// @RequestParam(value = "account", required = false)String account,
  549 +// @RequestParam(value = "phone") String phone,
  550 +// @RequestParam(value = "enable") Integer enable,
  551 +// @RequestParam(value = "remarks", required = false) String remarks,
  552 +// @RequestParam(value = "roleIds") String roleIds) {
  553 +//
  554 +//
  555 +// //获取登录用户
  556 +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  557 +// Users user = usersService.getUsersByLoginCenterId(loginState.getId());
  558 +//
  559 +// Departments departments = departmentsService.getDepartments(deptId);
  560 +// Organization organization = organizationService.getOrganization(orgId);
  561 +//
  562 +// if (type == null || StringUtils.isBlank(roleIds) || deptId == null ||
  563 +// StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments || null == organization) {
  564 +// ResultUtils.buildParameterErrorResultAndWrite(response);
  565 +// return;
  566 +// }
  567 +//
  568 +// if (user != null) {
  569 +//
  570 +// //检查注册账户是否存在
  571 +// UsersQuery usersQuery = new UsersQuery();
  572 +// usersQuery.setPhone(phone);
  573 +// List<Users> usersList = usersService.queryUsers(usersQuery);
  574 +// if (usersList.size() != 0) {
  575 +// Map<String, Object> map = new HashMap<>();
  576 +// map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
  577 +// map.put(ResultUtils.ERROR_MSG, "用户已存在");
  578 +// writeJson(response, JsonUtil.obj2JsonString(map));
  579 +// return;
  580 +// }
  581 +//
  582 +// //准备添加数据
  583 +// Users users = new Users();
  584 +// users.setType(type);
  585 +// users.setDeptId(deptId);
  586 +// users.setOrgId(orgId);
  587 +// users.setName(name);
  588 +// users.setAccount(account);
  589 +// users.setPhone(phone);
  590 +// users.setEnable(enable);
  591 +// users.setRemarks(remarks);
  592 +// users.setPublishId(user.getId());
  593 +// users.setPublishName(user.getName());
  594 +// users.setYn(YnEnums.YES.getId());
  595 +// users.setModified(new Date());
  596 +// users.setCreated(new Date());
  597 +// users.setLastLoginTime(new Date());
  598 +//// users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
  599 +//
  600 +// //关联登录中心ID
  601 +// Integer loginCenterId = LoginUtil.register(phone, token, typeId);
  602 +// if(null == loginCenterId) {
  603 +// ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, "服务器内部错误");
  604 +// return;
  605 +// }
  606 +// users.setLogincenterId(loginCenterId);
  607 +//
  608 +// usersService.addUsers(users);
  609 +//
  610 +//
  611 +// //如有角色,则对用户角色中间表新增
  612 +// UserRoleMaps userRoleMaps = new UserRoleMaps();
  613 +//
  614 +// String[] roleArrayIds = roleIds.split(",");
  615 +// List<Users> user1 = usersService.queryUsers(usersQuery);
  616 +// for (String id : roleArrayIds) {
  617 +// Roles roles = rolesService.getRoles(Integer.valueOf(id));
  618 +// if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
  619 +// continue;
  620 +// }
  621 +//
  622 +// if (user1.get(0).getId() != null) {
  623 +// userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
  624 +// userRoleMaps.setUserId(user1.get(0).getId());
  625 +// userRoleMaps.setYn(YnEnums.YES.getId());
  626 +// userRoleMapsService.addUserRoleMaps(userRoleMaps);
  627 +// }
  628 +// }
  629 +// ResultUtils.buildSuccessResultAndWrite(response);
  630 +// }
  631 +// }
411 632  
412 633 /**
413 634 * 用户修改