From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 42 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
index 57b433f..ffc3208 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
@@ -13,17 +13,17 @@
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,12 +45,19 @@
@Autowired(required = false)
private ManageRoleMapper manageRoleMapper;
- @Autowired
- LogUtils logUtils;
@Override
@Transactional
- public Map<String, Object> updateRoleMenu(List list, int id) {
+ public Map<String, Object> updateRoleMenu(List menuList, int id) {
+ //���������������
+ List supplementList = new ArrayList();
+ supplementList.addAll(menuList);
+ for (int i=0;i<supplementList.size();i++) {
+ supplementList.addAll(supplementParentMenus(Integer.parseInt(supplementList.get(i).toString())));
+ }
+ LinkedHashSet<Object> hashSet = new LinkedHashSet<>(supplementList);
+ ArrayList<Object> list = new ArrayList<>(hashSet);
+ //return null;
Map<String,Object> resultMap = new HashMap<>();
List<ManageMenu> manageMenusOld = manageMenuMapper.getManageMenuByRoleId(id);
QueryWrapper<ManageRoleMenu> wrapper = new QueryWrapper();
@@ -63,7 +70,7 @@
result = manageRoleMenuMapper.getDataByMenuIds(list,id);
}
List<Map> result1 = manageRoleMenuMapper.getDataByRoleId(id);
- if (manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0){
+ if ((manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0)&&list.size()!=0){
List<Map> insertList = new ArrayList<>();
for (Object temp:list) {
Map<String,Object> map = new HashMap<>();
@@ -74,48 +81,51 @@
if (insertList.size()!=0){
manageRoleMenuMapper.insertBatch(insertList);
}
- }
- List updateList = new ArrayList();
- for (Map manageRoleMenu:result1) {
- int have = 1;
- for (Object temp:list){
- if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
- have = 2;
+ }else {
+ List updateList = new ArrayList();
+ for (Map manageRoleMenu:result1) {
+ int have = 1;
+ for (Object temp:list){
+ if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
+ have = 2;
+ continue;
+ }
+ }
+ if (have == 2){
continue;
}
+ updateList.add(manageRoleMenu.get("menu_id"));
}
- if (have == 2){
- continue;
- }
- updateList.add(manageRoleMenu.get("menu_id"));
- }
- List insertList = new ArrayList();
- for (Object temp:list) {
- int have = 1;
- for (Map manageRoleMenu:result1){
- if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
- have = 2;
+ List insertList = new ArrayList();
+ for (Object temp:list) {
+ int have = 1;
+ for (Map manageRoleMenu:result1){
+ if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
+ have = 2;
+ continue;
+ }
+ }
+ if (have == 2){
continue;
}
+ insertList.add(temp);
}
- if (have == 2){
- continue;
+ if (updateList.size()>0){
+ manageRoleMenuMapper.updateDeleteStateByRoleIdMenuIds(updateList,id);
}
- insertList.add(temp);
- }
- if (updateList.size()>0){
- manageRoleMenuMapper.updateDeleteStateByRoleIdMenuIds(updateList,id);
- }
- if (insertList.size()>0){
- List mapList = new ArrayList();
- for (Object temp:insertList) {
- Map<String,Integer> insertMap = new HashMap<>();
- insertMap.put("role_id",id);
- insertMap.put("menu_id",Integer.parseInt(temp.toString()));
- mapList.add(insertMap);
+ if (insertList.size()>0){
+ List mapList = new ArrayList();
+ for (Object temp:insertList) {
+ Map<String,Integer> insertMap = new HashMap<>();
+ insertMap.put("role_id",id);
+ insertMap.put("menu_id",Integer.parseInt(temp.toString()));
+ mapList.add(insertMap);
+ }
+ manageRoleMenuMapper.insertBatch(mapList);
}
- manageRoleMenuMapper.insertBatch(mapList);
}
+ //������token
+ TokenUtils.destoryToken(id);
List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
List manageMenuOldList = new ArrayList();
List manageMenuNewList = new ArrayList();
@@ -137,9 +147,26 @@
manageMenuNewList.add("���");
}
content = content+"������:"+manageMenuOldList+"->"+manageMenuNewList+";";
- logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
+
+ /**
+ * @Description: ���������������
+ * @Param: [list, menuId]list���menuId������
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/7
+ */
+ private List supplementParentMenus(int menuId) {
+ List list = new ArrayList();
+ ManageMenu manageMenu = manageMenuMapper.getManageMenuById(menuId);
+ if (manageMenu.getParentId()!=0){
+ list.add(manageMenu.getParentId());
+ list.addAll(supplementParentMenus(manageMenu.getParentId()));
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0