shiyang / regional-platform

Download as
Browse Code »

Commit 192fac6bc2a2461f5831de73a5ae5ebe464dd2d9

Authored by jiangjiazhi
2 parents 81d0fc7c7e c562df9aae
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 192fac6
... ... @@ -123,7 +123,7 @@
123 123  
124 124 //获取登录用户
125 125 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
126   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  126 + Users users = usersService.getUsers(loginState.getId());
127 127  
128 128 if (null == name || null == orgId || null == users || null == organization) {
129 129 ResultUtils.buildParameterErrorResultAndWrite(response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 192fac6
... ... @@ -129,7 +129,7 @@
129 129  
130 130 //获取登录用户
131 131 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
132   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  132 + Users users = usersService.getUsers(loginState.getId());
133 133  
134 134 if (type == null || StringUtils.isBlank(name) || null == users) {
135 135 ResultUtils.buildParameterErrorResultAndWrite(response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java View file @ 192fac6
... ... @@ -62,6 +62,7 @@
62 62 @RequestMapping(value = "/permissions", method = RequestMethod.GET)
63 63 @TokenRequired
64 64 public void getPermissions(HttpServletResponse response,
  65 + @RequestParam(value = "id", required = false) Integer id,
65 66 @RequestParam(value = "page",required = false) Integer page,
66 67 @RequestParam(value = "limit",required = false) Integer limit) {
67 68 PermissionsQuery permissionsQuery = new PermissionsQuery();
... ... @@ -69,6 +70,7 @@
69 70 limit = null == limit ? 10 : limit;
70 71 permissionsQuery.setNeed("true");
71 72 permissionsQuery.setPage(page);
  73 + permissionsQuery.setId(id);
72 74 permissionsQuery.setLimit(limit);
73 75  
74 76 permissionsQuery.setYn(YnEnums.YES.getId());
... ... @@ -108,6 +110,7 @@
108 110 @RequestMapping(value = "/permissions", method = RequestMethod.POST)
109 111 @TokenRequired
110 112 public void addPermissions(HttpServletResponse response, HttpServletRequest request,
  113 + @RequestParam(value = "url") String url,
111 114 @RequestParam(value = "moduleName") String moduleName,
112 115 @RequestParam(value = "functionName") String functionName,
113 116 @RequestParam(value = "permissionName") String permissionName,
... ... @@ -121,7 +124,7 @@
121 124  
122 125 //获取登录用户
123 126 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
124   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  127 + Users users = usersService.getUsers(loginState.getId());
125 128  
126 129 Permissions permissions = new Permissions();
127 130  
... ... @@ -131,6 +134,7 @@
131 134 permissions.setPermissionName(permissionName);
132 135 permissions.setAction(action);
133 136 permissions.setExt(ext);
  137 + permissions.setUrl(url);
134 138 permissions.setPublishId(users.getId());
135 139 permissions.setPublishName(users.getName());
136 140 permissions.setWeight(weight);
137 141  
138 142  
139 143  
... ... @@ -182,25 +186,22 @@
182 186 /**
183 187 * 删除权限
184 188 */
185   - @RequestMapping(value = "/permissions", method = RequestMethod.DELETE)
  189 + @RequestMapping(value = "/permissions/{id}", method = RequestMethod.DELETE)
186 190 @TokenRequired
187   - public void deletePermissions(HttpServletResponse response, @RequestParam(value = "ids") String ids) {
188   - if (StringUtils.isEmpty(ids)) {
  191 + public void deletePermissions(HttpServletResponse response, @PathVariable(value = "id") String id) {
  192 + if (StringUtils.isEmpty(id)) {
189 193 ResultUtils.buildIdIsNull(response);
190 194 return;
191 195 }
192   - String[] idArray = ids.split(",");
193   - for (String id : idArray) {
194   - Permissions permissions = permissionsService.getPermissions(Integer.valueOf(id));
195   - if (permissions == null) {
196   - ResultUtils.buildIdResultData(response);
197   - return;
198   - }
199   - permissions.setYn(YnEnums.NO.getId());
200   - permissions.setModified(new Date());
201   - permissionsService.updatePermissions(permissions);
202   -
  196 + Permissions permissions = permissionsService.getPermissions(Integer.valueOf(id));
  197 + if (permissions == null) {
  198 + ResultUtils.buildIdResultData(response);
  199 + return;
203 200 }
  201 + permissions.setYn(YnEnums.NO.getId());
  202 + permissions.setModified(new Date());
  203 + permissionsService.updatePermissions(permissions);
  204 +
204 205 ResultUtils.buildSuccessResultAndWrite(response);
205 206 }
206 207  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 192fac6
... ... @@ -126,7 +126,7 @@
126 126  
127 127 //获取登录用户
128 128 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
129   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  129 + Users users = usersService.getUsers(loginState.getId());
130 130  
131 131 if ( StringUtils.isBlank(name) || null == users) {
132 132 ResultUtils.buildParameterErrorResultAndWrite(response);
... ... @@ -165,7 +165,7 @@
165 165  
166 166 //获取登录用户
167 167 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
168   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  168 + Users users = usersService.getUsers(loginState.getId());
169 169  
170 170 if (StringUtils.isBlank(name) || null == users) {
171 171 ResultUtils.buildParameterErrorResultAndWrite(response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 192fac6
... ... @@ -238,7 +238,7 @@
238 238 query.setYn(YnEnums.YES.getId());
239 239 List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
240 240 List<Roles> roles = new ArrayList<>();
241   - List<Permissions> permissions = new ArrayList<>();
  241 + List<Permissions> permissions = null;
242 242 RolePermissionMapsQuery rolePermissionMapsQuery ;
243 243 for(UserRoleMaps roleMaps : userRoleMapses) {
244 244 roles.add(rolesService.getRoles(roleMaps.getRoleId()));
... ... @@ -249,7 +249,13 @@
249 249 rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
250 250 List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
251 251 for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
252   - permissions.add(permissionsService.getPermissions(rolePermissionMaps.getPermissionId()));
  252 + Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
  253 + if(null != permissions1) {
  254 + if(null == permissions) {
  255 + permissions = new ArrayList<>();
  256 + }
  257 + permissions.add(permissions1);
  258 + }
253 259 }
254 260 }
255 261  
... ... @@ -364,7 +370,7 @@
364 370  
365 371 //获取登录用户
366 372 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
367   - Users user = usersService.getUsersByLoginCenterId(loginState.getId());
  373 + Users user = usersService.getUsers(loginState.getId());
368 374  
369 375  
370 376 if (StringUtils.isBlank(roleIds) ||
... ... @@ -457,7 +463,7 @@
457 463  
458 464 //获取登录用户
459 465 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
460   - Users user = usersService.getUsersByLoginCenterId(loginState.getId());
  466 + Users user = usersService.getUsers(loginState.getId());
461 467  
462 468 Departments departments = departmentsService.getDepartments(deptId);
463 469  
... ... @@ -664,7 +670,7 @@
664 670  
665 671 //获取登录用户
666 672 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
667   - Users user = usersService.getUsersByLoginCenterId(loginState.getId());
  673 + Users user = usersService.getUsers(loginState.getId());
668 674 if (user != null) {
669 675  
670 676 //检查账户是否存在
... ... @@ -822,7 +828,7 @@
822 828 }
823 829 //获取登录用户
824 830 LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
825   - Users users = usersService.getUsersByLoginCenterId(loginContext.getId());
  831 + Users users = usersService.getUsers(loginContext.getId());
826 832  
827 833 if (null != users) {
828 834 //修改前的密码