chore:补充提交

jinpengyong

2023-09-27 68e22957db996437fa20a9a4aa5ff37c54d4056f

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

@@ -30,14 +30,17 @@
import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
import com.moral.api.entity.Organization;
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.entity.UserLog;
import com.moral.api.mapper.MenuMapper;
import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserLogMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bo.UserBO;
import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.UserService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.Constants;
@@ -76,6 +79,7 @@

    @Autowired
    private OperationLogUtils operationLogUtils;


    @Value("${AES.KEY}")
    private String AESKey;
@@ -119,12 +123,13 @@
        //封装用户信息
        Map<String, Object> userInfo = new LinkedHashMap<>();

        //用户in西
        //用户信息
        userInfo.put("userId", userBo.getId());
        userInfo.put("account", userBo.getAccount());
        userInfo.put("userName", userBo.getUserName());
        userInfo.put("email", userBo.getEmail());
        userInfo.put("mobile", userBo.getMobile());
        userInfo.put("unitId",userBo.getUnitId());
        userInfo.put("wechat", userBo.getWechat());
        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
        userInfo.put("isAdmin", userBo.getIsAdmin());
@@ -140,9 +145,9 @@

        //用户组信息
        Group group = userBo.getGroup();

        Map<String, Object> groupMap = new LinkedHashMap<>();
        userInfo.put("group", groupMap);
        if (group != null) {
            Map<String, Object> groupMap = new LinkedHashMap<>();
            groupMap.put("id", group.getId());
            groupMap.put("groupName", group.getGroupName());
            userInfo.put("group", groupMap);
@@ -175,8 +180,8 @@
    }

    @Override
    public Map<String, Object> getUserInfo(String token) {
        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
    public Map<String, Object> getCurrentUserInfo() {
        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        return userInfo;
    }

@@ -219,6 +224,7 @@
        //筛选出下一级菜单信息
        List<Menu> nextLevelMenus = menus.stream()
                .filter(o -> o.getParentId().equals(menu.getId()))
                .sorted(Comparator.comparing(Menu::getOrder))
                .collect(Collectors.toList());
        List<Map<String, Object>> list = new ArrayList<>();
        if (nextLevelMenus.size() > 0) {
@@ -240,11 +246,9 @@
    @Override
    @Transactional
    public Map<String, Object> addUser(User user) {
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String token = request.getHeader("token");

        Map<String, Object> result = new HashMap<>();
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();

        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
@@ -306,7 +310,7 @@
        userMapper.insert(user);
        //日志
        String content = "添加了用户：" + user.getAccount();
        operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
        operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
        return result;
    }

@@ -328,27 +332,22 @@
            TokenUtils.destoryToken(userId.toString(), token);
        }
        //日志
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String content = "删除了用户：" + user.getAccount();
        operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
        operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE);
    }

    @Override
    @Transactional
    public Map<String, Object> updateUser(User user) {
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String token = request.getHeader("token");

        Map<String, Object> result = new HashMap<>();
        //更新的属性
        Map<String, Object> update = JSONObject.parseObject(JSON.toJSONString(user), Map.class);
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        User beforeUser = userMapper.selectById(user.getId());
        Map<String, Object> before = JSONObject.parseObject(JSON.toJSONString(beforeUser), Map.class);
        /*String account = beforeUser.getAccount();
        //account不可修改
        user.setAccount(account);*/
        System.out.println(user);
        if (!ObjectUtils.isEmpty(user.getAccount())) {
            QueryWrapper<User> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("account", user.getAccount());
@@ -367,7 +366,6 @@
        }
        //密码校验
        String password = user.getPassword();
        System.out.println("password==" + password);
        if (!ObjectUtils.isEmpty(password)) {
            //密码解密
            password = AESUtils.decrypt(password, AESKey);
@@ -396,13 +394,9 @@
        Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        if (userExpireTime != null) {
            if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
                user.setExpireTime(orgExpireTime);
            } else {
                user.setExpireTime(userExpireTime);
            }
        } else {
            if (orgExpireTime != null) {
                user.setExpireTime(orgExpireTime);
                result.put("code", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getCode());
                result.put("msg", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getMsg());
                return result;
            }
        }
        //更新redis
@@ -414,7 +408,8 @@
        userMapper.updateById(user);

        //日志
        StringBuilder content = new StringBuilder("修改了用户：" + user.getAccount() + "->");
        String account = userMapper.selectById(userId).getAccount();
        StringBuilder content = new StringBuilder("修改了用户：" + account + "->");
        for (String key : update.keySet()) {
            Object afterValue = update.get(key);
            if (!key.equals("id") && afterValue != null) {
@@ -423,16 +418,13 @@
                content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
            }
        }
        operationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
        operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE);
        return result;
    }

    @Override
    public Page<User> selectUsers(Map<String, Object> parameters) {
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String token = request.getHeader("token");

        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("organization_id", orgInfo.get("id"))