From f2f77f203fd6b054197ecaba0517a159e8b3ac8f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 30 Oct 2023 15:48:24 +0800
Subject: [PATCH] fix：补偿0问题修改
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 68 +++++++++++++++------------------
1 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index f37282e..20bb680 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -3,7 +3,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Objects;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -24,10 +23,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -49,10 +44,13 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
- public Map<String, Object> addGroup(Group group, String token) {
+ public Map<String, Object> addGroup(Group group) {
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();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
@@ -66,36 +64,37 @@
}
group.setOrganizationId(orgId);
groupMapper.insert(group);
+
//������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
+ operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@Override
- public void deleteGroup(Group group) {
+ public void deleteGroup(Integer id) {
//������������group
- group.setIsDelete(Constants.DELETE);
- groupMapper.updateById(group);
- //������������group_menu
+ UpdateWrapper<Group> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id).set("is_delete", Constants.DELETE);
+ groupMapper.update(null, updateWrapper);
+ //������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", id);
+ 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", id);
+ userGroupMapper.delete(deleteUserGroupWrapper);
//������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
+ String content = "���������������" + groupMapper.selectById(id).getGroupName();
+ operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE);
}
@Override
- public Map<String, Object> updateGroup(Group group, String token) {
+ public Map<String, Object> updateGroup(Group group) {
+ 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> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
@@ -111,20 +110,20 @@
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(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());
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", orgId)
- .eq("is_delete", Constants.NOT_DELETE);
+ .eq("is_delete", Constants.NOT_DELETE)
+ .ne("group_name", "admin");
Object order = parameters.get("order");
Object orderType = parameters.get("orderType");
Object groupName = parameters.get("groupName");
@@ -133,18 +132,9 @@
queryWrapper.like("group_name", groupName);
}
- //������������
- if (!parameters.containsKey("page")) {
- parameters.put("page", 0);
- }
- if (!parameters.containsKey("size")) {
- parameters.put("size", 10);
- }
-
int page = Integer.parseInt(parameters.get("page").toString());
int size = Integer.parseInt(parameters.get("size").toString());
Page<Group> pageData = new Page<>(page, size);
- //������������,������id������
//������������,������create_time������
if (order != null && orderType != null) {
if (Constants.ORDER_ASC.equals(orderType)) {
@@ -159,4 +149,8 @@
return pageData;
}
+ @Override
+ public Map<String, Object> getGroup(Integer userId) {
+ return groupMapper.selectUserGroup(userId);
+ }
}
--
Gitblit v1.8.0