From 24679b74b46479acf248151f70a3768a9588249b Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Thu, 15 Oct 2020 16:58:55 +0800 Subject: [PATCH] 修改 h端添加的用户不能在h端登录的问题 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java index bb3a836..2151dda 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java @@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -87,7 +86,7 @@ */ @GetMapping(value = "/users/name/{username}") @ApiOperation(value = "根据用户名查询用户实体") - @Cacheable(value = "user", key = "#username") +// @Cacheable(value = "user", key = "#username") public SysUser selectByUsername(@PathVariable String username) { return appUserService.selectByUsername(username); } @@ -199,8 +198,6 @@ }) @GetMapping("/users") public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) { -// log.info("租户ID:"+ TenantContextHolder.getTenant()); -// log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP)); return appUserService.findUsers(params); } /** @@ -247,7 +244,7 @@ */ @PutMapping(value = "/users/{id}/password") @AuditLog(operation = "'重置用户密码:' + #id") - public ResultBody resetPassword(@PathVariable Long id) { + public ResultBody resetPassword(@PathVariable Long id) throws Exception{ if (checkAdmin(id)) { return ResultBody.failed(ADMIN_CHANGE_MSG); } @@ -255,10 +252,22 @@ } /** + * 返回给Python加密密码 + */ + @GetMapping(value = "/users/python") + public ResultBody jiaMipython(@RequestParam("password") String password) { + if (password==null||"".equals(password)) { + return ResultBody.failed().msg("请输入密码"); + } + ResultBody resultBody = appUserService.jiaMipython(password); + return resultBody; + } + + /** * 用户自己修改密码 */ @PutMapping(value = "/users/password") - public ResultBody resetPassword(@RequestBody SysUser sysUser) { + public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception { if (checkAdmin(sysUser.getId())) { return ResultBody.failed().msg(ADMIN_CHANGE_MSG); } @@ -270,7 +279,7 @@ * 用户自己修改密码-后端以外 */ @PutMapping(value = "/users/resetpassword") - public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) { + public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) throws Exception { Long id = MapUtils.getLong(params, "id"); String oldPassword = MapUtils.getString(params, "oldPassword"); String newPassword = MapUtils.getString(params, "newPassword"); @@ -293,7 +302,7 @@ * @return */ @PutMapping(value = "/users/updateusertel") - public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) { + public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) throws Exception { String oldTel = MapUtils.getString(params, "oldTel"); if (oldTel==null){ return ResultBody.failed("请输入原账号"); @@ -318,7 +327,20 @@ boolean v = appUserService.delUser(id); return ResultBody.ok().msg("删除成功").data(v); } - + /** + * 删除用户 不删除关系表 ,role_user 表 和 用户组织 + * + * @param id + */ + @DeleteMapping(value = "/users/deleteNoContact/{id}") + //@AuditLog(operation = "'删除用户:' + #id") + public ResultBody deleteNoContact(@PathVariable Long id) { + if (checkAdmin(id)) { + return ResultBody.failed(ADMIN_CHANGE_MSG); + } + boolean v = appUserService.deleteNoContact(id); + return ResultBody.ok().msg("删除成功").data(v); + } /** * 新增or更新 @@ -341,7 +363,7 @@ */ @PostMapping("/users/doctorUserReg") @AuditLog(operation = "'注册/添加用户:' + #userRegVo.mobile") - public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) { + public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) throws Exception { return appUserService.doctorUserReg(userRegVo,sysUser); } @@ -398,7 +420,7 @@ * 根据map查询 */ private boolean checkAdmin(long id) { - return id == 1L; + return id == CommonConstant.ADMIN_USER_ID; } @PostMapping("/users/findAll") @@ -429,7 +451,7 @@ * 通过手机修改密码 */ @PutMapping(value = "/users/passwordByPhone") - public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) { + public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) throws Exception { return appUserService.passwordByPhone(map); } -- Gitblit v1.8.0