From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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 2c7e1fc..57b433f 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
@@ -2,15 +2,24 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.ManageMenu;
+import com.moral.api.entity.ManageRole;
import com.moral.api.entity.ManageRoleMenu;
+import com.moral.api.mapper.ManageMenuMapper;
+import com.moral.api.mapper.ManageRoleMapper;
import com.moral.api.mapper.ManageRoleMenuMapper;
import com.moral.api.service.ManageRoleMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
+import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+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;
@@ -30,19 +39,29 @@
@Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
+ @Autowired(required = false)
+ private ManageMenuMapper manageMenuMapper;
+
+ @Autowired(required = false)
+ private ManageRoleMapper manageRoleMapper;
+
+ @Autowired
+ LogUtils logUtils;
+
@Override
@Transactional
public Map<String, Object> updateRoleMenu(List list, int id) {
Map<String,Object> resultMap = new HashMap<>();
- if (list.size()==0){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- return resultMap;
- }
+ List<ManageMenu> manageMenusOld = manageMenuMapper.getManageMenuByRoleId(id);
QueryWrapper<ManageRoleMenu> wrapper = new QueryWrapper();
wrapper.eq("role_id",id);
wrapper.eq("is_delete",0);
- List<Map> result = manageRoleMenuMapper.getDataByMenuIds(list,id);
+ List<Map> result = new ArrayList<>();
+ if (list.size()==0){
+ result = result;
+ }else {
+ result = manageRoleMenuMapper.getDataByMenuIds(list,id);
+ }
List<Map> result1 = manageRoleMenuMapper.getDataByRoleId(id);
if (manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0){
List<Map> insertList = new ArrayList<>();
@@ -52,7 +71,9 @@
map.put("menu_id",Integer.parseInt(temp.toString()));
insertList.add(map);
}
- manageRoleMenuMapper.insertBatch(insertList);
+ if (insertList.size()!=0){
+ manageRoleMenuMapper.insertBatch(insertList);
+ }
}
List updateList = new ArrayList();
for (Map manageRoleMenu:result1) {
@@ -95,6 +116,28 @@
}
manageRoleMenuMapper.insertBatch(mapList);
}
+ List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
+ List manageMenuOldList = new ArrayList();
+ List manageMenuNewList = new ArrayList();
+ for (ManageMenu manageMenu:manageMenusOld) {
+ manageMenuOldList.add(manageMenu.getName());
+ }
+ for (ManageMenu manageMenu:manageMenusNew) {
+ manageMenuNewList.add(manageMenu.getName());
+ }
+ //������������������
+ ManageRole manageRole = manageRoleMapper.selectById(id);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+manageRole.getName()+";";
+ if (manageMenuOldList.size()==0){
+ manageMenuOldList.add("���");
+ }
+ if (manageMenuNewList.size()==0){
+ manageMenuNewList.add("���");
+ }
+ content = content+"������:"+manageMenuOldList+"->"+manageMenuNewList+";";
+ logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
--
Gitblit v1.8.0