From c8748cf690e2806b59a5cf39732ee56995dd4e7b Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 14 Apr 2021 11:28:48 +0800
Subject: [PATCH] 添加角色新增日志
---
screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java | 2
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 29 ++++-----
screen-manage/src/main/resources/application-dev.yml | 4 -
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 69 +++++++++++++++-------
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java | 41 +++++++++++++
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 25 ++++++--
6 files changed, 120 insertions(+), 50 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
index e5e7990..794c7d3 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -45,13 +46,12 @@
@ApiImplicitParam(name = "order", value = "������������������", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "insertOneManageMenu", method = RequestMethod.POST)
- public ResultMessage insertOneManageMenu(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage insertOneManageMenu(@RequestBody Map<String, Object> parameters) {
ManageMenu manageMenu = JSON.parseObject(JSON.toJSONString(parameters), ManageMenu.class);
Map<String,Object> resultMap = manageMenuService.insertManageMenu(manageMenu);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
@@ -64,28 +64,26 @@
@ApiImplicitParam(name = "url", value = "url������", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "updateManageMenuById", method = RequestMethod.POST)
- public ResultMessage updateManageMenuById(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage updateManageMenuById(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = manageMenuService.updateManageMenu(parameters);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
}
- @ApiOperation(value = "������������", notes = "������������")
+ @ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
})
@RequestMapping(value = "deleteManageMenu", method = RequestMethod.POST)
- public ResultMessage deleteManageMenu(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage deleteManageMenu(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = manageMenuService.deleteManageMenu(parameters);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
@@ -93,8 +91,6 @@
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- /*@ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
- @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")*/
})
@RequestMapping(value = "getAllManageMenu", method = RequestMethod.GET)
public ResultMessage getAllManageMenu(HttpServletRequest request) {
@@ -121,8 +117,7 @@
@ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
})
@RequestMapping(value = "getManageMenuByNameFuzzy", method = RequestMethod.GET)
- public ResultMessage getManageMenuByNameFuzzy(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
+ public ResultMessage getManageMenuByNameFuzzy(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = new HashMap<>();
if (parameters.get("name") == null || parameters.get("current") == null || parameters.get("size") == null){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java b/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
index f696784..df78a6e 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
@@ -32,7 +32,7 @@
List<ManageMenu> getAllMenus();
- List<ManageMenu> getManageMenuByRoleId(int roleId);
+ List getManageMenuByRoleId(int roleId);
List<ManageMenu> getManageMenuByNameFuzzy(Map map);
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 3b0d4bf..460ccb7 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
@@ -8,13 +8,18 @@
import com.moral.api.mapper.ManageRoleMenuMapper;
import com.moral.api.service.ManageMenuService;
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.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -38,6 +43,9 @@
@Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
+ @Autowired
+ LogUtils logUtils;
+
@Override
@Transactional
public Map<String, Object> insertManageMenu(ManageMenu manageMenu) {
@@ -51,7 +59,11 @@
resultMap.put("code", ResponseCodeEnum.MENU_IS_EXPIRE.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXPIRE.getMsg());
} else {
- manageMenuMapper.insertOne(manageMenu);
+ //manageMenuMapper.insertOne(manageMenu);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "������������:"+manageMenu.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
}
@@ -71,7 +83,30 @@
resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
} else {
+ //���������������������������������������
+ ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
manageMenuMapper.updateManageMenuById(map);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+manageMenuOld.getName()+";";
+ for (Object key:map.keySet()) {
+ if (key.toString().equals("name")){
+ content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("url")){
+ content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("icon")){
+ content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("parent_id")){
+ content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
+ }
+ if (key.toString().equals("icon")){
+ content = content+"������������������������:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
+ }
+ }
+ logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
}
@@ -99,6 +134,11 @@
Map role_menuDeleteMap = new HashMap();
role_menuDeleteMap.put("menu_id", id);
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());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
}
@@ -141,30 +181,13 @@
}
@Override
- public List<ManageMenu> getManageMenuByRoleId(int roleId) {
+ public List getManageMenuByRoleId(int roleId) {
List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByRoleId(roleId);
- System.out.println(manageMenus);
- if(ObjectUtils.isEmpty(manageMenus))
- return null;
- Map<Integer, ManageMenu> menusMap = new HashMap<>();
- for (ManageMenu menu : manageMenus) {
- menu.setChildren(new ArrayList<>());//���������
- menusMap.put(menu.getId(), menu);
+ List menuIdList = new ArrayList();
+ for (ManageMenu manageMenu:manageMenus) {
+ menuIdList.add(manageMenu.getId());
}
- for (ManageMenu menu : manageMenus) {
- combinationParentChildrenMenus(menusMap, menu);
- }
-
- //������������������������������������parentId������0������������������������
- manageMenus.removeIf(new Predicate<ManageMenu>() {
- @Override
- public boolean test(ManageMenu manageMenu) {
- if(manageMenu.getParentId().equals(0))
- return false;
- return true;
- }
- });
- return manageMenus;
+ return menuIdList;
}
@Override
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..5450a72 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,10 +39,20 @@
@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<>();
+ List<ManageMenu> manageMenusOld = manageMenuMapper.getManageMenuByRoleId(id);
if (list.size()==0){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -95,6 +114,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;
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..bccc23d 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
@@ -126,7 +126,7 @@
//������������������
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 +145,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")){
+ content = content+"���������:"+manageRoleOld.getName()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("desc")){
+ 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());
}
@@ -203,18 +217,17 @@
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());
}
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 8bb2db8..5e3b8e1 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -123,9 +123,7 @@
- /system/**
- /role/**
- - /menu/getAllManageMenu
- - /menu/getManageMenuByNameFuzzy
- - /menu/getManageMenuByRoleId
+ - /menu/**
- /api/**
AES:
KEY:
--
Gitblit v1.8.0