From 657182c7989dc77b69bb3f9adaf6c75b6466ff95 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 10:31:35 +0800
Subject: [PATCH] screen-manage 编辑账号接口删除分配角色功能，分配角色功能变为单独接口
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 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 bccc23d..6f2cb80 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,22 +2,14 @@
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.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 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.StringUtils;
@@ -51,6 +43,9 @@
@Autowired(required = false)
private ManageRoleMapper manageRoleMapper;
+
+ @Autowired(required = false)
+ private ManageMenuMapper manageMenuMapper;
@Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
@@ -105,22 +100,29 @@
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);
}
//������������������
@@ -152,10 +154,10 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������������:"+manageRoleOld.getName()+";";
for (Object key:map.keySet()) {
- if (key.toString().equals("name")){
+ if (key.toString().equals("name")&&map.get(key)!=null){
content = content+"���������:"+manageRoleOld.getName()+"->"+map.get(key)+";";
}
- if (key.toString().equals("desc")){
+ if (key.toString().equals("desc")&&map.get(key)!=null){
content = content+"������:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
}
}
@@ -175,6 +177,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");
@@ -233,4 +236,21 @@
}
return resultMap;
}
+
+ /**
+ * @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