jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1b67bf29ad94ea775b146cee012bd3a5cb58ec25

Authored by jiangjiazhi
2 parents 1272e8b4ad 52a82227db
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 1b67bf2
... ... @@ -7,9 +7,7 @@
7 7 import com.lyms.platform.common.constants.ConstantInterface;
8 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
9 9 import com.lyms.platform.common.enums.YnEnums;
10   -import com.lyms.platform.common.utils.JsonUtil;
11   -import com.lyms.platform.common.utils.LoginUtil;
12   -import com.lyms.platform.common.utils.ResultUtils;
  10 +import com.lyms.platform.common.utils.*;
13 11 import com.lyms.platform.operate.web.result.FrontEndResult;
14 12 import com.lyms.platform.permission.model.*;
15 13 import com.lyms.platform.permission.service.*;
... ... @@ -20,6 +18,7 @@
20 18 import org.springframework.stereotype.Controller;
21 19 import org.springframework.web.bind.annotation.*;
22 20  
  21 +import javax.management.relation.Role;
23 22 import javax.servlet.http.HttpServletRequest;
24 23 import javax.servlet.http.HttpServletResponse;
25 24 import java.util.*;
... ... @@ -56,6 +55,7 @@
56 55 private static final String LYMS = "龙源美生";
57 56  
58 57  
  58 +
59 59 /**
60 60 * 获取管理员列表
61 61 */
... ... @@ -63,10 +63,10 @@
63 63 @ResponseBody
64 64 @TokenRequired
65 65 public FrontEndResult getAdminList(HttpServletResponse response,
66   - @RequestParam(value = "keyword", required = false) String keyword,
67   - @RequestParam(value = "rolesId", required = false) Integer rolesId,
68   - @RequestParam(value = "page", required = false) Integer page,
69   - @RequestParam(value = "limit", required = false) Integer limit) {
  66 + @RequestParam(value = "keyword", required = false) String keyword,
  67 + @RequestParam(value = "rolesId", required = false) Integer rolesId,
  68 + @RequestParam(value = "page", required = false) Integer page,
  69 + @RequestParam(value = "limit", required = false) Integer limit) {
70 70  
71 71 limit = limit == null ? 10 : limit;
72 72 page = page == null ? 1 : page;
... ... @@ -83,7 +83,7 @@
83 83  
84 84 List<Users> users = usersService.queryUsers2(usersQuery);
85 85 //设置用户角色信息
86   - for (Users user : users) {
  86 + for(Users user : users) {
87 87 user.setRoles(this.getUserRoles(user.getId()));
88 88 user.setOrganization(organizationService.getOrganization(user.getOrgId()));
89 89 user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
... ... @@ -98,6 +98,7 @@
98 98 }
99 99  
100 100  
  101 +
101 102 /**
102 103 * 获取用户列表
103 104 */
... ... @@ -105,12 +106,12 @@
105 106 @TokenRequired
106 107 @ResponseBody
107 108 public FrontEndResult getPermissions(HttpServletResponse response,
108   - @RequestParam(value = "keyword", required = false) String keyword,
109   - @RequestParam(value = "rolesId", required = false) Integer rolesId,
110   - @RequestParam(value = "page", required = false) Integer page,
111   - @RequestParam(value = "limit", required = false) Integer limit,
112   - @RequestParam(value = "orgId", required = false) Integer orgId,
113   - @RequestParam(value = "deptId", required = false) Integer deptId) {
  109 + @RequestParam(value = "keyword", required = false) String keyword,
  110 + @RequestParam(value = "rolesId", required = false) Integer rolesId,
  111 + @RequestParam(value = "page", required = false) Integer page,
  112 + @RequestParam(value = "limit", required = false) Integer limit,
  113 + @RequestParam(value = "orgId", required = false) Integer orgId,
  114 + @RequestParam(value = "deptId", required = false) Integer deptId) {
114 115  
115 116 limit = limit == null ? 10 : limit;
116 117 page = page == null ? 1 : page;
... ... @@ -131,7 +132,7 @@
131 132 List<Users> users = usersService.queryUsers2(usersQuery);
132 133  
133 134 //设置用户角色信息
134   - for (Users user : users) {
  135 + for(Users user : users) {
135 136 user.setRoles(this.getUserRoles(user.getId()));
136 137 user.setOrganization(organizationService.getOrganization(user.getOrgId()));
137 138 user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
138 139  
... ... @@ -147,13 +148,13 @@
147 148 }
148 149  
149 150 //获取用户角色信息
150   - private List<Roles> getUserRoles(Integer userId) {
  151 + private List<Roles> getUserRoles(Integer userId) {
151 152 UserRoleMapsQuery query = new UserRoleMapsQuery();
152 153 query.setUserId(userId);
153 154 query.setYn(YnEnums.YES.getId());
154 155 List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
155 156 List<Roles> roles = new ArrayList<>();
156   - for (UserRoleMaps roleMaps : userRoleMapses) {
  157 + for(UserRoleMaps roleMaps : userRoleMapses) {
157 158 roles.add(rolesService.getRoles(roleMaps.getRoleId()));
158 159 }
159 160 return roles;
160 161  
... ... @@ -179,13 +180,13 @@
179 180 UsersQuery usersQuery = new UsersQuery();
180 181 usersQuery.setPhone(account);
181 182 List<Users> users = usersService.queryUsers(usersQuery);
182   - if (0 == users.size()) {
  183 + if(0 == users.size()) {
183 184 ResultUtils.buildParameterErrorResultAndWrite(response, "该账户不存在");
184 185 return;
185 186 }
186 187  
187   - String key = LoginUtil.login(account, code, typeId, token);
188   - if (null != key) {
  188 + String key =LoginUtil.login(account, code, typeId, token);
  189 + if(null != key) {
189 190 Users users1 = new Users();
190 191 users1.setId(users.get(0).getId());
191 192 users1.setLastLoginTime(new Date());
... ... @@ -194,7 +195,7 @@
194 195 Map<String, Object> result = new HashMap<>();
195 196 result.put("token", key);
196 197 ResultUtils.buildSuccessResultAndWrite(response, result);
197   - } else {
  198 + }else {
198 199 ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.PARAMETER_ERROR, "登录失败,手机或验证码错误");
199 200 }
200 201 }
201 202  
202 203  
... ... @@ -217,18 +218,18 @@
217 218 usersQuery.setPhone(phone);
218 219 usersQuery.setYn(YnEnums.YES.getId());
219 220 List<Users> list = usersService.queryUsers(usersQuery);
220   - if (0 == list.size()) {
  221 + if(0 == list.size()) {
221 222 ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在");
222 223 return;
223 224 }
224 225  
225   - if (list.get(0).getEnable().equals(2)) {
  226 + if(!list.get(0).getEnable().equals(1)) {
226 227 ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用");
227 228 return;
228 229 }
229 230  
230 231 LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token);
231   - if (null != loginContext) {
  232 + if(null != loginContext) {
232 233 ResultUtils.buildResultAndWrite(httpServletResponse, loginContext.getErrorcode(), loginContext.getErrormsg());
233 234 return;
234 235 }
... ... @@ -245,7 +246,7 @@
245 246 public void usersLoginMsg(HttpServletResponse response, HttpServletRequest request) {
246 247 LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
247 248 Users users = null;
248   - if (null != loginContext) {
  249 + if(null != loginContext) {
249 250 users = usersService.getUsers(loginContext.getId());
250 251 }
251 252  
... ... @@ -256,8 +257,8 @@
256 257 List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
257 258 List<Roles> roles = new ArrayList<>();
258 259 List<Permissions> permissions = null;
259   - RolePermissionMapsQuery rolePermissionMapsQuery;
260   - for (Integer roleMaps : userRoleMapses) {
  260 + RolePermissionMapsQuery rolePermissionMapsQuery ;
  261 + for(Integer roleMaps : userRoleMapses) {
261 262 roles.add(rolesService.getRoles(roleMaps));
262 263  
263 264 //获取角色权限信息
264 265  
... ... @@ -265,10 +266,10 @@
265 266 rolePermissionMapsQuery.setRoleId(roleMaps);
266 267 rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
267 268 List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
268   - for (RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
  269 + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
269 270 Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
270   - if (null != permissions1) {
271   - if (null == permissions) {
  271 + if(null != permissions1) {
  272 + if(null == permissions) {
272 273 permissions = new ArrayList<>();
273 274 }
274 275 permissions.add(permissions1);
275 276  
... ... @@ -292,12 +293,12 @@
292 293 @RequestMapping(value = "/users/userRole/{id}", method = RequestMethod.GET)
293 294 @TokenRequired
294 295 public void userRole(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id) {
295   - UserRoleMapsQuery query = new UserRoleMapsQuery();
  296 + UserRoleMapsQuery query = new UserRoleMapsQuery();
296 297 query.setUserId(id);
297 298 query.setYn(YnEnums.YES.getId());
298 299 List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
299 300 List<Roles> roles = new ArrayList<>();
300   - for (UserRoleMaps roleMaps : userRoleMapses) {
  301 + for(UserRoleMaps roleMaps : userRoleMapses) {
301 302 roles.add(rolesService.getRoles(roleMaps.getRoleId()));
302 303 }
303 304  
304 305  
... ... @@ -305,12 +306,13 @@
305 306 }
306 307  
307 308  
  309 +
308 310 /**
309 311 * 管理员权限设置
310 312 */
311 313 @RequestMapping(value = "/adminPermissions", method = RequestMethod.POST)
312 314 @TokenRequired
313   - public void adminPermissions(HttpServletResponse response, @RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids) {
  315 + public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){
314 316  
315 317 if (ids == null) {
316 318 ResultUtils.buildParameterErrorResultAndWrite(response);
... ... @@ -329,7 +331,7 @@
329 331 return;
330 332 }
331 333  
332   - if (!usersList.get(0).getType().equals(0)) {
  334 + if(!usersList.get(0).getType().equals(0)) {
333 335 ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误");
334 336 }
335 337  
... ... @@ -337,8 +339,8 @@
337 339 UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
338 340 userOrganizationMapsQuery.setUserId(userId);
339 341 List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
340   - if (0 < userOrganizationMapsList.size()) {
341   - for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
  342 + if(0 < userOrganizationMapsList.size()) {
  343 + for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
342 344 userOrganizationMaps.setYn(YnEnums.NO.getId());
343 345 userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps);
344 346 }
345 347  
... ... @@ -346,12 +348,12 @@
346 348  
347 349 //添加最新权限映射
348 350 String[] roleArrayIds = ids.split(",");
349   - Users user = usersList.get(0);
  351 + Users user = usersList.get(0);
350 352 UserOrganizationMaps userOrganizationMaps = null;
351 353 Organization organization = null;
352 354 for (String id : roleArrayIds) {
353 355 organization = organizationService.getOrganization(Integer.valueOf(id));
354   - if (null != organization) {
  356 + if(null != organization) {
355 357 userOrganizationMaps = new UserOrganizationMaps();
356 358 userOrganizationMaps.setUserId(user.getId());
357 359 userOrganizationMaps.setOrgId(Integer.valueOf(id));
... ... @@ -377,7 +379,7 @@
377 379 public void addAdmin(HttpServletResponse response,
378 380 HttpServletRequest request,
379 381 @RequestParam(value = "name", required = false) String name,
380   - @RequestParam(value = "account", required = false) String account,
  382 + @RequestParam(value = "account", required = false)String account,
381 383 @RequestParam(value = "phone") String phone,
382 384 @RequestParam(value = "enable") Integer enable,
383 385 @RequestParam(value = "remarks", required = false) String remarks,
... ... @@ -390,7 +392,7 @@
390 392  
391 393  
392 394 if (StringUtils.isBlank(roleIds) ||
393   - StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user) {
  395 + StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user ) {
394 396 ResultUtils.buildParameterErrorResultAndWrite(response);
395 397 return;
396 398 }
... ... @@ -427,7 +429,7 @@
427 429  
428 430 //关联登录中心ID
429 431 LoginContext loginContext = LoginUtil.register(phone, token, typeId);
430   - if (!loginContext.getErrorcode().equals(0)) {
  432 + if(!loginContext.getErrorcode().equals(0)) {
431 433 ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
432 434 return;
433 435 }
... ... @@ -441,7 +443,7 @@
441 443 UserRoleMaps userRoleMaps = new UserRoleMaps();
442 444  
443 445 String[] roleArrayIds = roleIds.split(",");
444   - List<Users> user1 = usersService.queryUsers(usersQuery);
  446 + List<Users> user1 = usersService.queryUsers(usersQuery);
445 447 for (String id : roleArrayIds) {
446 448 Roles roles = rolesService.getRoles(Integer.valueOf(id));
447 449 if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
... ... @@ -471,7 +473,7 @@
471 473 @RequestParam(value = "deptId", required = false) Integer deptId,
472 474 @RequestParam(value = "ksId", required = false) Integer ksId,
473 475 @RequestParam(value = "name", required = false) String name,
474   - @RequestParam(value = "account", required = false) String account,
  476 + @RequestParam(value = "account", required = false)String account,
475 477 @RequestParam(value = "phone") String phone,
476 478 @RequestParam(value = "enable") Integer enable,
477 479 @RequestParam(value = "remarks", required = false) String remarks,
478 480  
... ... @@ -483,11 +485,11 @@
483 485 Users user = usersService.getUsers(loginState.getId());
484 486  
485 487  
486   - if (StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user) {
  488 + if ( StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user ) {
487 489 ResultUtils.buildParameterErrorResultAndWrite(response);
488 490 return;
489 491 }
490   - if (deptId == null && ksId == null) {
  492 + if(deptId == null && ksId == null) {
491 493 ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required");
492 494 return;
493 495 }
... ... @@ -527,7 +529,7 @@
527 529  
528 530 //关联登录中心ID
529 531 LoginContext loginContext = LoginUtil.register(phone, token, typeId);
530   - if (!loginContext.getErrorcode().equals(0)) {
  532 + if(!loginContext.getErrorcode().equals(0)) {
531 533 ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
532 534 return;
533 535 }
... ... @@ -540,7 +542,7 @@
540 542 UserRoleMaps userRoleMaps = new UserRoleMaps();
541 543  
542 544 String[] roleArrayIds = roleIds.split(",");
543   - List<Users> user1 = usersService.queryUsers(usersQuery);
  545 + List<Users> user1 = usersService.queryUsers(usersQuery);
544 546 for (String id : roleArrayIds) {
545 547 Roles roles = rolesService.getRoles(Integer.valueOf(id));
546 548 if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
... ... @@ -559,6 +561,7 @@
559 561 }
560 562  
561 563  
  564 +
562 565 // /**
563 566 // * 添加用户信息
564 567 // */
565 568  
... ... @@ -663,26 +666,21 @@
663 666 public void updateUsers(HttpServletResponse response,
664 667 HttpServletRequest request,
665 668 @PathVariable(value = "id") Integer id,
666   - @RequestParam(value = "name", required = false) String name,
667   - @RequestParam(value = "account", required = false) String account,
668   - @RequestParam(value = "phone", required = false) String phone,
669   - @RequestParam(value = "enable", required = false) Integer enable,
670   - @RequestParam(value = "remarks", required = false) String remarks,
671   - @RequestParam(value = "roleIds", required = false) String roleIds,
672   - @RequestParam(value = "orgId", required = false) Integer orgId,
673   - @RequestParam(value = "deptId", required = false) Integer deptId) {
674   -
675   -
  669 + @RequestParam(value = "name",required = false) String name,
  670 + @RequestParam(value = "account",required = false)String account,
  671 + @RequestParam(value = "phone",required = false) String phone,
  672 + @RequestParam(value = "enable",required = false) Integer enable,
  673 + @RequestParam(value = "remarks",required = false) String remarks,
  674 + @RequestParam(value = "roleIds",required = false) String roleIds,
  675 + @RequestParam(value = "orgId",required = false) Integer orgId,
  676 + @RequestParam(value = "deptId",required = false) Integer deptId) {
676 677 //获取登录用户
677 678 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
678 679 Users user = usersService.getUsers(loginState.getId());
679 680 if (user != null) {
680 681  
681   - //检查账户是否存在
682   - UsersQuery usersQuery = new UsersQuery();
683   - usersQuery.setPhone(phone);
684   - List<Users> usersList = usersService.queryUsers(usersQuery);
685   - if (usersList.size() == 0) {
  682 + Users users = usersService.getUsers(id);
  683 + if(null == users) {
686 684 Map<String, Object> map = new HashMap<>();
687 685 map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
688 686 map.put(ResultUtils.ERROR_MSG, "用户不存在");
689 687  
... ... @@ -690,11 +688,34 @@
690 688 return;
691 689 }
692 690  
693   - Users users = usersList.get(0);
694   - users.setId(id);
  691 +
  692 + //修改了手机号,不能修改已存在的手机号
  693 + if(!phone.equals(users.getPhone())) {
  694 + //检查账户是否存在
  695 + UsersQuery usersQuery = new UsersQuery();
  696 + usersQuery.setPhone(phone);
  697 + usersQuery.setYn(YnEnums.YES.getId());
  698 + List<Users> usersList = usersService.queryUsers(usersQuery);
  699 + if (0 < usersList.size()) {
  700 + Map<String, Object> map = new HashMap<>();
  701 + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
  702 + map.put(ResultUtils.ERROR_MSG, "手机号已存在");
  703 + writeJson(response, JsonUtil.obj2JsonString(map));
  704 + return;
  705 + }
  706 +
  707 +
  708 + LoginContext loginContext = LoginUtil.register(phone, token, typeId);
  709 + if(!loginContext.getErrorcode().equals(0)) {
  710 + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
  711 + return;
  712 + }
  713 + users.setPhone(phone);
  714 + users.setLogincenterId(loginContext.getId());
  715 + }
  716 +
695 717 users.setName(name);
696 718 users.setAccount(account);
697   - users.setPhone(phone);
698 719 users.setEnable(enable);
699 720 users.setRemarks(remarks);
700 721 users.setModified(new Date());
701 722  
702 723  
... ... @@ -705,31 +726,45 @@
705 726  
706 727  
707 728 //如有角色,则对用户角色中间表先删除后新增
708   - if (null != roleIds) {
709   -
710   - Integer _userId = usersList.get(0).getId();
711   - UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
712   - userRoleMapsQuery.setUserId(_userId);
713   - List<UserRoleMaps> roleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
714   - for (UserRoleMaps userRoleMaps : roleMapsList) {
715   - userRoleMaps.setYn(YnEnums.NO.getId());
716   - userRoleMapsService.updateUserRoleMaps(userRoleMaps);
  729 + if(null != roleIds) {
  730 + String[] roleArrayIds = roleIds.split(",");
  731 + //判断角色是否有更新
  732 + Boolean flag = false;
  733 + if(null == users.getRoles()) flag = true;
  734 + if(!flag) {
  735 + for (String s : roleArrayIds) {
  736 + for(Roles role : users.getRoles()) {
  737 + if(s.equals(role.getId().toString())) continue;
  738 + flag = true;
  739 + }
  740 + if(flag) break;
  741 + }
717 742 }
718 743  
719   -
720   - UserRoleMaps userRoleMaps = new UserRoleMaps();
721   - String[] roleArrayIds = roleIds.split(",");
722   - for (String tmp : roleArrayIds) {
723   - Roles roles = rolesService.getRoles(Integer.valueOf(tmp));
724   - if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
725   - continue;
  744 + if(flag) {
  745 + Integer _userId = users.getId();
  746 + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
  747 + userRoleMapsQuery.setUserId(_userId);
  748 + List<UserRoleMaps> roleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
  749 + for (UserRoleMaps userRoleMaps : roleMapsList) {
  750 + userRoleMaps.setYn(YnEnums.NO.getId());
  751 + userRoleMapsService.updateUserRoleMaps(userRoleMaps);
726 752 }
727 753  
728   - if (user.getId() != null) {
729   - userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp)));
730   - userRoleMaps.setUserId(_userId);
731   - userRoleMaps.setYn(YnEnums.YES.getId());
732   - userRoleMapsService.addUserRoleMaps(userRoleMaps);
  754 +
  755 + UserRoleMaps userRoleMaps = new UserRoleMaps();
  756 + for (String tmp : roleArrayIds) {
  757 + Roles roles = rolesService.getRoles(Integer.valueOf(tmp));
  758 + if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
  759 + continue;
  760 + }
  761 +
  762 + if (user.getId() != null) {
  763 + userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp)));
  764 + userRoleMaps.setUserId(_userId);
  765 + userRoleMaps.setYn(YnEnums.YES.getId());
  766 + userRoleMapsService.addUserRoleMaps(userRoleMaps);
  767 + }
733 768 }
734 769 }
735 770 }
... ... @@ -742,7 +777,7 @@
742 777 */
743 778 @RequestMapping(value = "/users/enable", method = RequestMethod.POST)
744 779 @TokenRequired
745   - public void enableUsers(HttpServletResponse response, @RequestParam Integer id, @RequestParam Integer flag) {
  780 + public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) {
746 781  
747 782  
748 783 //检查账户是否存在
749 784  
... ... @@ -766,12 +801,14 @@
766 801 }
767 802  
768 803  
  804 +
  805 +
769 806 /**
770 807 * 用户删除
771 808 */
772 809 @RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE)
773 810 @TokenRequired
774   - public void deleteUsers(HttpServletResponse response, @PathVariable Integer id) {
  811 + public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) {
775 812 if (null == id) {
776 813 ResultUtils.buildIdIsNull(response);
777 814 return;
... ... @@ -813,6 +850,7 @@
813 850 }
814 851  
815 852  
  853 +
816 854 /**
817 855 * 修改用户密码
818 856 */
... ... @@ -869,18 +907,6 @@
869 907 users.setModified(new Date());
870 908 usersService.updateUsers(users);
871 909 ResultUtils.buildSuccessResultAndWrite(response);
872   - }
873   -
874   - @RequestMapping(value = "/logout", method = RequestMethod.GET)
875   - @ResponseBody
876   - public Map<String, Object> resetToken(@RequestHeader(value = "Authorization", required = false) String token) {
877   - if (StringUtils.isNotEmpty(token)) {
878   - LoginUtil.deleteToken(token);
879   - }
880   - Map<String, Object> result = new HashMap<>();
881   - result.put("errorcode", ConstantInterface.SUCCESS);
882   - result.put("errormsg", "update");
883   - return result;
884 910 }
885 911 }