日志接口重构

jinpengyong

2021-04-14 f05a7d377838ba6b809329829aff058a8c455736

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

@@ -50,7 +50,10 @@
    private UserGroupMapper userGroupMapper;

    @Override
    public Map<String, Object> addGroup(Group group, String token) {
    public Map<String, Object> addGroup(Group group) {
        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> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
@@ -66,10 +69,10 @@
        }
        group.setOrganizationId(orgId);
        groupMapper.insert(group);

        //日志
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String content = "添加了组：" + group.getGroupName();
        OperationLogUtils.insertLog(request, content);
        OperationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
        return result;
    }

@@ -78,22 +81,26 @@
        //逻辑删除group
        group.setIsDelete(Constants.DELETE);
        groupMapper.updateById(group);
        //逻辑删除group_menu
        //删除group_menu
        UpdateWrapper<GroupMenu> deleteGroupWrapper = new UpdateWrapper<>();
        deleteGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
        groupMenuMapper.update(null, deleteGroupWrapper);
        //逻辑删除user_group
        deleteGroupWrapper.eq("group_id", group.getId());
        groupMenuMapper.delete(deleteGroupWrapper);
        //删除user_group
        UpdateWrapper<UserGroup> deleteUserGroupWrapper = new UpdateWrapper<>();
        deleteUserGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
        userGroupMapper.update(null, deleteUserGroupWrapper);
        deleteUserGroupWrapper.eq("group_id", group.getId());
        userGroupMapper.delete(deleteUserGroupWrapper);
        //日志
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String content = "删除了组：" + group.getGroupName();
        OperationLogUtils.insertLog(request, content);
        OperationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
    }

    @Override
    public Map<String, Object> updateGroup(Group group, String token) {
    public Map<String, Object> updateGroup(Group group) {
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String token = request.getHeader("token");

        String before = groupMapper.selectById(group.getId()).getGroupName();
        Map<String, Object> result = new HashMap<>();
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
@@ -111,15 +118,17 @@
        group.setOrganizationId(orgId);
        groupMapper.updateById(group);
        //日志
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String content = "修改了组：" + group.getGroupName();
        OperationLogUtils.insertLog(request, content);
        String content = "修改了组：" + before + "=>" + group.getGroupName();
        OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
        return result;
    }

    @Override
    public Page<Group> selectGroups(Map<String, Object> parameters) {
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
        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> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
        Integer orgId = (Integer) orgInfo.get("id");
        QueryWrapper<Group> queryWrapper = new QueryWrapper<>();