From 9931aa31c53b29878454f07e85d6463d26fd1c25 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 May 2021 11:16:38 +0800
Subject: [PATCH] 因子默认单位添加；角色、菜单更新判断是否更改
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 13 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index f665091..5b9656c 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageMenu;
@@ -20,6 +21,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -56,10 +58,10 @@
return resultMap;
}
if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null) {
- resultMap.put("code", ResponseCodeEnum.MENU_IS_EXPIRE.getCode());
- resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXPIRE.getMsg());
+ resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
} else {
- //manageMenuMapper.insertOne(manageMenu);
+ manageMenuMapper.insertOne(manageMenu);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+manageMenu.getName()+";";
@@ -90,20 +92,23 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������������:"+manageMenuOld.getName()+";";
for (Object key:map.keySet()) {
- if (key.toString().equals("name")){
+ if (key.toString().equals("name")&&map.get(key)!=null){
content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
}
- if (key.toString().equals("url")){
+ if (key.toString().equals("url")&&map.get(key)!=null){
content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
}
- if (key.toString().equals("icon")){
+ if (key.toString().equals("icon")&&map.get(key)!=null){
content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
}
- if (key.toString().equals("parent_id")){
+ if (key.toString().equals("parent_id")&&map.get(key)!=null){
content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
}
- if (key.toString().equals("order")){
+ if (key.toString().equals("order")&&map.get(key)!=null){
content = content+"������������������������:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("desc")&&map.get(key)!=null){
+ content = content+"������:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
}
}
logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
@@ -126,6 +131,8 @@
resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
} else {
+ //������������������������������
+ ManageMenu manageMenuDelete = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
Map deleteMap = new HashMap();
int id = Integer.parseInt(map.get("id").toString());
deleteMap.put("id", id);
@@ -136,7 +143,6 @@
manageRoleMenuMapper.updateDeleteStateByMenu_id(role_menuDeleteMap);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- ManageMenu manageMenuDelete = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
String content = "������������:"+manageMenuDelete.getName()+";";
logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
@@ -146,12 +152,33 @@
}
@Override
- public List<ManageMenu> getAllWithPagingQuery(Map map) {
+ public List<Map<String,Object>> getAllWithPagingQuery(Map map) {
Map limitMap = new HashMap();
limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
limitMap.put("number", Integer.parseInt(map.get("size").toString()));
List<ManageMenu> manageMenus = manageMenuMapper.getDataWithPage(limitMap);
- return manageMenus;
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> resultList = new ArrayList<>();
+ for (ManageMenu manageMenu:manageMenus) {
+ Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
+ if (manageMenu.getParentId().equals(0)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ ManageMenu parentMenu = manageMenuMapper.getManageMenuById(manageMenu.getParentId());
+ if (ObjectUtils.isEmpty(parentMenu)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ String parent_name = parentMenu.getName();
+ manegeMenuMap.put("parent_name",parent_name);
+ }
+ }
+ String createTime = SDF.format(manageMenu.getCreateTime());
+ String updateTime = SDF.format(manageMenu.getUpdateTime());
+ manegeMenuMap.put("createTime",createTime);
+ manegeMenuMap.put("updateTime",updateTime);
+ resultList.add(manegeMenuMap);
+ }
+ return resultList;
}
@Override
@@ -191,13 +218,82 @@
}
@Override
- public List<ManageMenu> getManageMenuByNameFuzzy(Map map) {
+ public List getManageChildMenuByRoleId(int roleId) {
+ List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByRoleId(roleId);
+ List menuIdList = new ArrayList();
+ Map limitMap = new HashMap();
+ limitMap.put("start", 1);
+ limitMap.put("number", 1);
+ for (ManageMenu manageMenu:manageMenus) {
+ limitMap.put("parent_id", manageMenu.getId());
+ List result = manageMenuMapper.getManageMenuByCondition(limitMap);
+ if (result.size()==0){
+ menuIdList.add(manageMenu.getId());
+ }
+ }
+ return menuIdList;
+ }
+
+ @Override
+ public List<Map<String,Object>> getManageMenuByNameFuzzy(Map map) {
Map limitMap = new HashMap();
limitMap.put("name", map.get("name"));
limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
limitMap.put("number", Integer.parseInt(map.get("size").toString()));
List<ManageMenu> manageMenus = manageMenuMapper.getManageRoleByNameFuzzy(limitMap);
- return manageMenus;
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> resultList = new ArrayList<>();
+ for (ManageMenu manageMenu:manageMenus) {
+ Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
+ if (manageMenu.getParentId().equals(0)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ ManageMenu parentMenu = manageMenuMapper.getManageMenuById(manageMenu.getParentId());
+ if (ObjectUtils.isEmpty(parentMenu)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ String parent_name = parentMenu.getName();
+ manegeMenuMap.put("parent_name",parent_name);
+ }
+ }
+ String createTime = SDF.format(manageMenu.getCreateTime());
+ String updateTime = SDF.format(manageMenu.getUpdateTime());
+ manegeMenuMap.put("createTime",createTime);
+ manegeMenuMap.put("updateTime",updateTime);
+ resultList.add(manegeMenuMap);
+ }
+ return resultList;
+ }
+
+ @Override
+ public List<Map<String, Object>> getManageMenuByParentId(Map map) {
+ Map limitMap = new HashMap();
+ limitMap.put("parent_id", map.get("parent_id"));
+ limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
+ limitMap.put("number", Integer.parseInt(map.get("size").toString()));
+ List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByCondition(limitMap);
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> resultList = new ArrayList<>();
+ for (ManageMenu manageMenu:manageMenus) {
+ Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
+ if (manageMenu.getParentId().equals(0)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ ManageMenu parentMenu = manageMenuMapper.getManageMenuById(manageMenu.getParentId());
+ if (ObjectUtils.isEmpty(parentMenu)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ String parent_name = parentMenu.getName();
+ manegeMenuMap.put("parent_name",parent_name);
+ }
+ }
+ String createTime = SDF.format(manageMenu.getCreateTime());
+ String updateTime = SDF.format(manageMenu.getUpdateTime());
+ manegeMenuMap.put("createTime",createTime);
+ manegeMenuMap.put("updateTime",updateTime);
+ resultList.add(manegeMenuMap);
+ }
+ return resultList;
}
@Override
--
Gitblit v1.8.0