From 616dca8f5bbb17f0b3a124340965c0232fdae894 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sun, 25 Apr 2021 10:32:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java | 2 +
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 13 ++++++
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 4 +-
screen-manage/src/main/resources/application-dev.yml | 4 +-
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 21 +++++++++-
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 2
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java | 69 +++++++++++++++++-----------------
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 4 +-
8 files changed, 75 insertions(+), 44 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index 2bf52ba..2ac36bb 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -32,9 +32,9 @@
TIME_FORMAT_INVALID(-18,"������������������"),
TIME_INVALID(-19,"������������"),
GROUP_EXIST(-20, "������������"),
- ROLE_IS_EXPIRE(-21, "���������������������"),
+ ROLE_IS_EXIST(-21, "���������������"),
ROLE_IS_NULL(-22, "���������������"),
- MENU_IS_EXPIRE(-23, "���������������������"),
+ MENU_IS_EXIST(-23, "���������������"),
MENU_IS_NULL(-24, "���������������"),
PARAMETERS_NOT_REQUIREMENT(-25, "���������������������"),
DICTTYPE_NOT_EXIST(-26,"���������������������"),
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 c4f87db..ebe54ef 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
@@ -30,7 +30,7 @@
@Slf4j
@Api(tags = {"������"})
@RestController
-@RequestMapping("/menu")
+@RequestMapping("/manageMenu")
public class ManageMenuController {
@Autowired
@@ -181,4 +181,15 @@
List<Map<String,Object>> re = manageMenuService.getManageMenuByParentId(parameters);
return ResultMessage.ok(re);
}
+
+ @ApiOperation(value = "������roleId������������", notes = "������roleId������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "roleId", value = "������id", required = true, paramType = "query", dataType = "int")
+ })
+ @RequestMapping(value = "getManageChildMenuByRoleId", method = RequestMethod.GET)
+ public ResultMessage getManageChildMenuByRoleId(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<ManageMenu> result = manageMenuService.getManageChildMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
+ return ResultMessage.ok(result);
+ }
}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
index e56cf48..4b43851 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
@@ -29,7 +29,7 @@
@Slf4j
@Api(tags = {"������"})
@RestController
-@RequestMapping("/role")
+@RequestMapping("/manageRole")
public class ManageRoleController {
@Autowired
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 4c08837..d8e1711 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
@@ -34,6 +34,8 @@
List getManageMenuByRoleId(int roleId);
+ List getManageChildMenuByRoleId(int roleId);
+
List<Map<String,Object>> getManageMenuByNameFuzzy(Map map);
List<Map<String,Object>> getManageMenuByParentId(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 e64de85..6c5fcdc 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
@@ -58,8 +58,8 @@
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);
//������������������
@@ -215,6 +215,23 @@
}
@Override
+ 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"));
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 57b433f..b09e4b8 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
@@ -63,7 +63,7 @@
result = manageRoleMenuMapper.getDataByMenuIds(list,id);
}
List<Map> result1 = manageRoleMenuMapper.getDataByRoleId(id);
- if (manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0){
+ if ((manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0)&&list.size()!=0){
List<Map> insertList = new ArrayList<>();
for (Object temp:list) {
Map<String,Object> map = new HashMap<>();
@@ -74,47 +74,48 @@
if (insertList.size()!=0){
manageRoleMenuMapper.insertBatch(insertList);
}
- }
- List updateList = new ArrayList();
- for (Map manageRoleMenu:result1) {
- int have = 1;
- for (Object temp:list){
- if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
- have = 2;
+ }else {
+ List updateList = new ArrayList();
+ for (Map manageRoleMenu:result1) {
+ int have = 1;
+ for (Object temp:list){
+ if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
+ have = 2;
+ continue;
+ }
+ }
+ if (have == 2){
continue;
}
+ updateList.add(manageRoleMenu.get("menu_id"));
}
- if (have == 2){
- continue;
- }
- updateList.add(manageRoleMenu.get("menu_id"));
- }
- List insertList = new ArrayList();
- for (Object temp:list) {
- int have = 1;
- for (Map manageRoleMenu:result1){
- if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
- have = 2;
+ List insertList = new ArrayList();
+ for (Object temp:list) {
+ int have = 1;
+ for (Map manageRoleMenu:result1){
+ if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
+ have = 2;
+ continue;
+ }
+ }
+ if (have == 2){
continue;
}
+ insertList.add(temp);
}
- if (have == 2){
- continue;
+ if (updateList.size()>0){
+ manageRoleMenuMapper.updateDeleteStateByRoleIdMenuIds(updateList,id);
}
- insertList.add(temp);
- }
- if (updateList.size()>0){
- manageRoleMenuMapper.updateDeleteStateByRoleIdMenuIds(updateList,id);
- }
- if (insertList.size()>0){
- List mapList = new ArrayList();
- for (Object temp:insertList) {
- Map<String,Integer> insertMap = new HashMap<>();
- insertMap.put("role_id",id);
- insertMap.put("menu_id",Integer.parseInt(temp.toString()));
- mapList.add(insertMap);
+ if (insertList.size()>0){
+ List mapList = new ArrayList();
+ for (Object temp:insertList) {
+ Map<String,Integer> insertMap = new HashMap<>();
+ insertMap.put("role_id",id);
+ insertMap.put("menu_id",Integer.parseInt(temp.toString()));
+ mapList.add(insertMap);
+ }
+ manageRoleMenuMapper.insertBatch(mapList);
}
- manageRoleMenuMapper.insertBatch(mapList);
}
List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
List manageMenuOldList = new ArrayList();
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..aca8fc5 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
@@ -105,8 +105,8 @@
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);
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 18804a4..fd79cd8 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -125,8 +125,8 @@
- /verificationCode/**
- /manageLog/**
- - /role/**
- - /menu/**
+ - /manageRole/**
+ - /manageMenu/**
- /api/**
AES:
KEY:
--
Gitblit v1.8.0