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-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 121 ++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 29 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 2509d63..396e77b 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -2,24 +2,19 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.ManageAccount;
-import com.moral.api.entity.ManageAccountRole;
-import com.moral.api.entity.ManageLog;
-import com.moral.api.entity.ManageRole;
-import com.moral.api.mapper.ManageAccountRoleMapper;
-import com.moral.api.mapper.ManageLogMapper;
-import com.moral.api.mapper.ManageRoleMapper;
-import com.moral.api.mapper.ManageRoleMenuMapper;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.*;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.ManageRoleService;
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 com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -28,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.function.Predicate;
/**
* <p>
@@ -53,13 +49,14 @@
private ManageRoleMapper manageRoleMapper;
@Autowired(required = false)
+ private ManageMenuMapper manageMenuMapper;
+
+ @Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
@Autowired(required = false)
private ManageAccountRoleMapper manageAccountRoleMapper;
- @Autowired
- LogUtils logUtils;
@Override
public Map<String,Object> getAllWithPagingQuery(Map map) {
@@ -83,6 +80,19 @@
manageRoleMap.put("key",manageRole.getId());
manageRolesList.add(manageRoleMap);
}
+ //���admin��������� admin���������������
+ AccountInfoDTO accountInfo = (AccountInfoDTO) TokenUtils.getUserInfo();
+ List<ManageRole> roles = accountInfo.getRoles();
+ if(!roles.get(0).getName().equals("admin")){
+ manageRolesList.removeIf(new Predicate<Map<String, Object>>() {
+ @Override
+ public boolean test(Map<String, Object> map) {
+ if(map.get("name").equals("admin"))
+ return true;
+ return false;
+ }
+ });
+ }
resultMap.put("manageRoles",manageRolesList);
int totalNumber = manageRoleMapper.selectCount(wrapper);
resultMap.put("totalNumber",totalNumber);
@@ -105,28 +115,35 @@
return resultMap;
}
if (manageRoleMapper.getManageRoleByName(manageRole.getName()) != null){
- resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXPIRE.getCode());
- resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXPIRE.getMsg());
+ resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXIST.getMsg());
return resultMap;
}
manageRoleMapper.insertOne(manageRole);
ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
int role_id = manageRoleIns.getId();
- List insertList = new ArrayList();
- for (Object temp: list) {
- Map<String,Integer> insertMap = new HashMap<>();
- insertMap.put("role_id",role_id);
- insertMap.put("menu_id",Integer.parseInt(temp.toString()));
- insertList.add(insertMap);
- }
- //���������������������������������������������
- if (insertList.size()>0){
+ if (list.size()>0){
+ //���������������
+ List supplementList = new ArrayList();
+ supplementList.addAll(list);
+ 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> menuList = new ArrayList<>(hashSet);
+ List insertList = new ArrayList();
+ for (Object temp: menuList) {
+ Map<String,Integer> insertMap = new HashMap<>();
+ insertMap.put("role_id",role_id);
+ insertMap.put("menu_id",Integer.parseInt(temp.toString()));
+ insertList.add(insertMap);
+ }
manageRoleMenuMapper.insertBatch(insertList);
}
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+manageRole.getName()+";";
- logUtils.saveOperationForManage(request,content,"1");
+ LogUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
@@ -145,7 +162,21 @@
resultMap.put("code",ResponseCodeEnum.ROLE_IS_NULL.getCode());
resultMap.put("msg",ResponseCodeEnum.ROLE_IS_NULL.getMsg());
}else {
+ //���������������������������������
+ ManageRole manageRoleOld = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
manageRoleMapper.updateManageRoleById(map);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+manageRoleOld.getName()+";";
+ for (Object key:map.keySet()) {
+ if (key.toString().equals("name")&&map.get(key)!=null){
+ content = content+"���������:"+manageRoleOld.getName()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("desc")&&map.get(key)!=null){
+ content = content+"������:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
+ }
+ }
+ LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
@@ -161,6 +192,7 @@
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
wrapper.like("name",map.get("name"));
+ wrapper.orderByDesc("create_time");
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -203,21 +235,52 @@
Map deleteMap = new HashMap();
deleteMap.put("id",Integer.parseInt(map.get("id").toString()));
deleteMap.put("is_delete",1);
- //manageRoleMapper.updateManageRoleById(deleteMap);
+ manageRoleMapper.updateManageRoleById(deleteMap);
ManageAccountRole manageAccountRole = new ManageAccountRole();
manageAccountRole.setIsDelete("1");
QueryWrapper<ManageAccountRole> wrapper = new QueryWrapper();
wrapper.eq("role_id",Integer.parseInt(map.get("id").toString()));
- //manageAccountRoleMapper.update(manageAccountRole,wrapper);
+ manageAccountRoleMapper.update(manageAccountRole,wrapper);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
ManageRole manageRole1 = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
- System.out.println(manageRole1);
- String content = "������������:"+manageRole.getName()+";";
- //logUtils.saveOperationForManage(request,content,"1");
+ String content = "������������:"+manageRole1.getName()+";";
+ LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
+
+ @Override
+ public ManageRole getRoleByAccountId(Integer accountId) {
+ QueryWrapper<ManageAccountRole> queryAccountRoleWrapper = new QueryWrapper<>();
+ queryAccountRoleWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryAccountRoleWrapper.eq("account_id",accountId);
+ ManageAccountRole accountRole = manageAccountRoleMapper.selectOne(queryAccountRoleWrapper);
+ if(ObjectUtils.isEmpty(accountRole))
+ return null;
+ Integer roleId = accountRole.getRoleId();
+ QueryWrapper<ManageRole> queryRoleWrapper = new QueryWrapper();
+ queryRoleWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryRoleWrapper.eq("id", roleId);
+ return manageRoleMapper.selectOne(queryRoleWrapper);
+ }
+
+ /**
+ * @Description: ���������������
+ * @Param: [list, menuId]list���menuId������
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/28
+ */
+ 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