改变角色清除redis用户信息

排行榜增加月度统计

yt-common/src/main/java/com/ytpm/middle/param/MiddleUserParam.java

@@ -38,7 +38,7 @@ public class MiddleUserParam extends MiddleUserListParam{
     @ApiModelProperty(value = "密码",required = true)
     private String password;
     @ApiModelProperty(value = "角色列表",required = false)
-    private List<MiddleRoleVO> roleList;
+    private List<Integer> roleList;
     @ApiModelProperty(value = "操作人ID",hidden = true)
     private String operatorId;
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/controller/UserController.java

@@ -46,7 +46,7 @@ public class UserController {
     @PostMapping("/updateOne")
     public Result<String> updateOne(@RequestBody MiddleUserParam param, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
         param.setOperatorId(userInfo.getUserId());
-        return userService.updateOne(param);
+        return userService.updateOne(param,userInfo.getLoginName());
     }
 
     @ApiImplicitParam(name = "userId", value = "用户ID", required = true)

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/UserService.java

@@ -19,7 +19,7 @@ public interface UserService {
     /**
      * 修改用户
      */
-    Result<String> updateOne(MiddleUserParam param);
+    Result<String> updateOne(MiddleUserParam param,String loginName);
 
     /**
      * 删除用户信息

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/UserServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ytpm.middle.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ytpm.constant.StrConstant;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
@@ -13,6 +15,7 @@ import com.ytpm.middle.model.YtMiddleUserRole;
 import com.ytpm.middle.param.MiddleUserListParam;
 import com.ytpm.middle.param.MiddleUserParam;
 import com.ytpm.middle.service.UserService;
+import com.ytpm.middle.util.RedisUtil;
 import com.ytpm.middle.view.MiddleRoleVO;
 import com.ytpm.middle.view.MiddleUserInfo;
 import com.ytpm.oauth.model.YtPlatformUser;
@@ -33,6 +36,8 @@ public class UserServiceImpl implements UserService {
 
     @Resource
     private MiddleUserMapper userMapper;
+    @Resource
+    private RedisUtil redisService;
 
     /**
      * 查询用户列表
@@ -74,7 +79,7 @@ public class UserServiceImpl implements UserService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<String> updateOne(MiddleUserParam param) {
+    public Result<String> updateOne(MiddleUserParam param,String loginName) {
         MiddleUserInfo byPhone = userMapper.selectPrimary(param.getUserId());
         if(Objects.isNull(byPhone)){
             return Result.resultErr(RepMessage.OBJECT_NOT_EXIST);
@@ -82,8 +87,10 @@ public class UserServiceImpl implements UserService {
         //修改用户信息
         YtPlatformUser user = new YtPlatformUser();
         BeanUtils.copyProperties(param, user);
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        user.setEncryptPwd(encoder.encode(param.getPassword()));
+        if(StrUtil.isNotBlank(param.getPassword())){
+            BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+            user.setEncryptPwd(encoder.encode(param.getPassword()));
+        }
         userMapper.updateById(user);
         param.setUserId(user.getUserId());
         //角色列表先删后增
@@ -91,6 +98,8 @@ public class UserServiceImpl implements UserService {
         if(CollUtil.isNotEmpty(param.getRoleList())){
             addUserRole(param);
         }
+        //清除redis用户信息
+        redisService.del(StrConstant.USER_INFO_PRE+loginName);
         return Result.resultOk(RepMessage.MODIFY_SUCCESS);
     }
 
@@ -116,7 +125,6 @@ public class UserServiceImpl implements UserService {
      * 增加用户角色
      */
     private void addUserRole(MiddleUserParam param) {
-        List<Integer> roleIds = param.getRoleList().stream().map(MiddleRoleVO::getRoleId).collect(Collectors.toList());
-        userMapper.addUserRoleList(param.getUserId(),roleIds,param.getOperatorId());
+        userMapper.addUserRoleList(param.getUserId(),param.getRoleList(),param.getOperatorId());
     }
 }