From 06319b271cec156bcfd348082fe0a6053272f469 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 17 Mar 2021 22:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.2=E3=80=91=E6=95=B4=E7=90=86?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/pojo/user/request/SysUserRequest.java | 2 +- .../controller/PersonalInfoController.java | 64 +++++++++++++++++++ .../user/controller/SysUserController.java | 36 ----------- .../user/service/impl/SysUserServiceImpl.java | 7 +- 4 files changed, 70 insertions(+), 39 deletions(-) create mode 100644 kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java index e83871157..39ac69d6b 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java @@ -26,7 +26,7 @@ public class SysUserRequest extends BaseRequest { /** * 主键 */ - @NotNull(message = "userId不能为空", groups = {edit.class, delete.class, detail.class, grantRole.class, grantData.class, updateInfo.class, resetPwd.class, changeStatus.class}) + @NotNull(message = "userId不能为空", groups = {edit.class, delete.class, detail.class, grantRole.class, grantData.class, resetPwd.class, changeStatus.class}) private Long userId; /** diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java new file mode 100644 index 000000000..fcfccb3be --- /dev/null +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java @@ -0,0 +1,64 @@ +package cn.stylefeng.roses.kernel.system.modular.user.controller; + +import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; +import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 个人信息控制器 + * + * @author fengshuonan + * @date 2021/3/17 22:05 + */ +@RestController +@ApiResource(name = "个人信息") +public class PersonalInfoController { + + @Resource + private SysUserService sysUserService; + + /** + * 更新用户个人信息 + * + * @author luojie + * @date 2020/11/6 13:50 + */ + @PostResource(name = "个人信息_更新个人信息", path = "/sysUser/updateInfo", requiredPermission = false) + public ResponseData updateInfo(@RequestBody @Validated(SysUserRequest.updateInfo.class) SysUserRequest sysUserRequest) { + sysUserService.editInfo(sysUserRequest); + return new SuccessResponseData(); + } + + /** + * 修改密码 + * + * @author luojie + * @date 2020/11/6 13:50 + */ + @PostResource(name = "个人信息_修改密码", path = "/sysUser/updatePassword", requiredPermission = false) + public ResponseData updatePwd(@RequestBody @Validated(SysUserRequest.updatePwd.class) SysUserRequest sysUserRequest) { + sysUserService.editPassword(sysUserRequest); + return new SuccessResponseData(); + } + + /** + * 修改头像 + * + * @author luojie + * @date 2020/11/6 13:48 + */ + @PostResource(name = "个人信息_修改头像", path = "/sysUser/updateAvatar", requiredPermission = false) + public ResponseData updateAvatar(@RequestBody @Validated(SysUserRequest.updateAvatar.class) SysUserRequest sysUserRequest) { + sysUserService.editAvatar(sysUserRequest); + return new SuccessResponseData(); + } + +} diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java index d02f766df..4018e20ba 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java @@ -83,18 +83,6 @@ public class SysUserController { return new SuccessResponseData(); } - /** - * 更新用户个人信息 - * - * @author luojie - * @date 2020/11/6 13:50 - */ - @PostResource(name = "系统用户_更新个人信息", path = "/sysUser/updateInfo", requiredPermission = false) - public ResponseData updateInfo(@RequestBody @Validated(SysUserRequest.updateInfo.class) SysUserRequest sysUserRequest) { - sysUserService.editInfo(sysUserRequest); - return new SuccessResponseData(); - } - /** * 修改状态 * @@ -107,18 +95,6 @@ public class SysUserController { return new SuccessResponseData(); } - /** - * 修改密码 - * - * @author luojie - * @date 2020/11/6 13:50 - */ - @PostResource(name = "系统用户_修改密码", path = "/sysUser/updatePassword", requiredPermission = false) - public ResponseData updatePwd(@RequestBody @Validated(SysUserRequest.updatePwd.class) SysUserRequest sysUserRequest) { - sysUserService.editPassword(sysUserRequest); - return new SuccessResponseData(); - } - /** * 重置密码 * @@ -131,18 +107,6 @@ public class SysUserController { return new SuccessResponseData(); } - /** - * 修改头像 - * - * @author luojie - * @date 2020/11/6 13:48 - */ - @PostResource(name = "系统用户_修改头像", path = "/sysUser/updateAvatar", requiredPermission = false) - public ResponseData updateAvatar(@RequestBody @Validated(SysUserRequest.updateAvatar.class) SysUserRequest sysUserRequest) { - sysUserService.editAvatar(sysUserRequest); - return new SuccessResponseData(); - } - /** * 授权角色 * diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 1274590bd..6e48a6287 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -205,14 +205,17 @@ public class SysUserServiceImpl extends ServiceImpl impl Long sysUserId = sysUser.getUserId(); // 更新用户员工信息 - sysUserOrgService.edit(sysUser.getUserId(), sysUserRequest.getOrgId(), sysUserRequest.getPositionId()); + sysUserOrgService.edit(sysUserId, sysUserRequest.getOrgId(), sysUserRequest.getPositionId()); // 清除缓存中的用户信息 - sysUserCacheOperatorApi.remove(String.valueOf(sysUser.getUserId())); + sysUserCacheOperatorApi.remove(String.valueOf(sysUserId)); } @Override public void editInfo(SysUserRequest sysUserRequest) { + + // 获取当前登录用户的id + sysUserRequest.setUserId(LoginContext.me().getLoginUser().getUserId()); SysUser sysUser = this.querySysUser(sysUserRequest); // 填充更新用户的信息