【7.0.2】整理个人信息的三个接口

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;
 
     /**

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();
+    }
+
+}

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();
-    }
-
     /**
      * 授权角色
      *

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<SysUserMapper, SysUser> 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);
 
         // 填充更新用户的信息