From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 104 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 42 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 e5fabb1..8a6c517 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
@@ -45,8 +45,6 @@
@Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
- @Autowired
- LogUtils logUtils;
@Override
@Transactional
@@ -60,15 +58,23 @@
if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null) {
resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
- } else {
- 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());
+ return resultMap;
}
+ QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
+ wrapper_url.eq("url",manageMenu.getUrl());
+ wrapper_url.eq("is_delete",Constants.NOT_DELETE);
+ if (manageMenuMapper.selectCount(wrapper_url) != 0) {
+ resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ 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());
return resultMap;
}
@@ -84,42 +90,56 @@
if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null) {
resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
- } else {
- if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
- resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
- resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
- return resultMap;
+ return resultMap;
+ }
+ if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
+ resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
+ wrapper_url.eq("url",map.get("url"));
+ wrapper_url.eq("is_delete",Constants.NOT_DELETE);
+ if (manageMenuMapper.selectCount(wrapper_url) != 0) {
+ resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ //���������������������������������������
+ 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")&&map.get(key)!=null){
+ content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
}
- //���������������������������������������
- 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")&&map.get(key)!=null){
- content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
- }
- if (key.toString().equals("url")&&map.get(key)!=null){
- content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
- }
- if (key.toString().equals("icon")&&map.get(key)!=null){
- content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
- }
- if (key.toString().equals("parent_id")&&map.get(key)!=null){
+ if (key.toString().equals("url")&&map.get(key)!=null){
+ content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("icon")&&map.get(key)!=null){
+ content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("parent_id")&&map.get(key)!=null){
+ if (map.get(key).toString().equals("0")){
+ content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->0"+";";
+ }else if (manageMenuOld.getId().toString().equals("0")){
+ content = content+"���������:"+"0->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
+ }else {
content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
}
- 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);
- resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ 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);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
@@ -149,7 +169,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+manageMenuDelete.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
}
--
Gitblit v1.8.0