删除，修改用户更新redis

jinpengyong

2021-03-23 9ec895d7754fdfd4918fab69cc220c0d814c41f7

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -115,7 +115,7 @@
        userInfo.put("locationLevel", organization.getLocationLevel());
        userInfo.put("groups", groups);
        Map<String, Object> map = new HashMap<>();
        map.put("userId",userBo.getId());
        map.put("userId", userBo.getId());
        userInfo.putAll(getMenus(map));
        try {
            //生成token，并存入redis
@@ -247,12 +247,18 @@
    @Override
    @Transactional
    public void deleteUser(User user) {
        String userId = user.getId().toString();
        //逻辑删除user
        user.setIsDelete(Constants.DELETE);
        userMapper.updateById(user);
        //逻辑删除user_group
        UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
        deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", user.getId());
        deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", userId);
        //更新redis
        if (TokenUtils.hHasKey(userId)) {
            String token = TokenUtils.hget(userId).toString();
            TokenUtils.destoryToken(userId, token);
        }
        userGroupMapper.update(null, deleteWrapper);
    }

@@ -265,7 +271,7 @@
        queryWrapper.ne("id", user.getId())
                .eq("account", user.getAccount())
                .eq("is_delete", Constants.NOT_DELETE);
        //校验账户是否存在
        //校验账户名是否重复
        if (userMapper.selectOne(queryWrapper) != null) {
            result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
            result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
@@ -285,12 +291,14 @@
        }
        //正则校验密码
        String password = user.getPassword();
        //密码解密
        //password = AESUtils.decrypt(password, AESKey);
        if (!RegexUtils.checkPassword(password)) {
            result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
            return result;
        if (password != null) {
            //密码解密
            //password = AESUtils.decrypt(password, AESKey);
            if (!RegexUtils.checkPassword(password)) {
                result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
                result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
                return result;
            }
        }
        //正则校验手机号
        if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
@@ -298,16 +306,22 @@
            result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
            return result;
        }
        //密码加密
        //密码MD5加密
        user.setPassword(MD5Utils.saltMD5(password));
        user.setOrganizationId((int) currentUserInfo.get("organizationId"));
        user.setIsAdmin(false);
        //新增账户的过期时间
        //所修改账户的过期时间
        Date userExpireTime = user.getExpireTime();
        //当前账户的过期时间
        Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
        if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
            user.setExpireTime(currentUserExpireTime);
        }
        //更新redis
        String userId = user.getId().toString();
        if (TokenUtils.hHasKey(userId)) {
            String deleterToken = TokenUtils.hget(userId).toString();
            TokenUtils.destoryToken(userId, deleterToken);
        }
        userMapper.updateById(user);
        return result;
@@ -341,13 +355,6 @@
        }
        if (wechat != null) {
            queryWrapper.like("wechat", wechat);
        }
        //分页参数
        if (!parameters.containsKey("page")) {
            parameters.put("page", 0);
        }
        if (!parameters.containsKey("size")) {
            parameters.put("size", 10);
        }

        int page = Integer.parseInt(parameters.get("page").toString());