From ebdacd7123e42c76cd7cb43938574cfeb0706250 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 22 Mar 2021 09:11:36 +0800
Subject: [PATCH] 角色菜单配置

---
 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java                  |    6 +
 screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java     |   37 ++++++------
 screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java          |    8 ++
 screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java        |   21 +++++++
 screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java |   29 +++++++++
 screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java     |   41 +++++++------
 6 files changed, 103 insertions(+), 39 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 66c5b2b..17f146a 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -23,7 +23,11 @@
     ACCOUNT_INVALID(-11, "���������������"),
     PASSWORD_INVALID(-12, "������������"),
     ACCOUNT_IS_EXPIRE(-13, "���������������"),
-    GROUP_EXIST(-14, "������������")
+    GROUP_EXIST(-14, "������������"),
+    ROLE_IS_EXPIRE(-15, "���������������"),
+    ROLE_IS_NULL(-16, "������������"),
+    MENU_IS_EXPIRE(-17, "���������������"),
+    MENU_IS_NULL(-18, "������������")
 
     ;
     private final Integer code;
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 c34831d..4a275c9 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
@@ -4,6 +4,7 @@
 import com.moral.api.entity.ManageMenu;
 import com.moral.api.entity.ManageRole;
 import com.moral.api.service.ManageMenuService;
+import com.moral.api.service.ManageRoleMenuService;
 import com.moral.api.service.ManageRoleService;
 import com.moral.constant.ResultMessage;
 import com.moral.util.WebUtils;
@@ -33,6 +34,9 @@
 
     @Autowired
     private ManageRoleService manageRoleService;
+
+    @Autowired
+    private ManageRoleMenuService manageRoleMenuService;
 
     @ApiOperation(value = "������������������", notes = "������������������")
     @ApiImplicitParams({
@@ -115,4 +119,21 @@
         List<ManageRole> re = manageRoleService.getManageRoleByNameFuzzy(parameters);
         return ResultMessage.ok(re);
     }
+
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
+    })
+    @RequestMapping(value = "updateRoleMenu", method = RequestMethod.GET)
+    public ResultMessage updateRoleMenu(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        int id = Integer.parseInt(parameters.get("id").toString());
+        List list = new ArrayList();
+        list.add(1);
+        list.add(2);
+        list.add(3);
+        list.add(4);
+        Map<String,Object> re = manageRoleMenuService.updateRoleMenu(list,id);
+        return ResultMessage.ok(re);
+    }
 }
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java
index 95afb02..5e9236d 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java
@@ -2,6 +2,10 @@
 
 import com.moral.api.entity.ManageRoleMenu;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -11,6 +15,10 @@
  * @author moral
  * @since 2021-03-09
  */
+@Transactional
 public interface ManageRoleMenuService extends IService<ManageRoleMenu> {
 
+    @Transactional
+    Map<String,Object> updateRoleMenu(List list,int id);
+
 }
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 23ab730..60ed80c 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
@@ -5,6 +5,7 @@
 import com.moral.api.mapper.ManageRoleMenuMapper;
 import com.moral.api.service.ManageMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.ResponseCodeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,17 +36,17 @@
     public Map<String,Object> insertManageMenu(ManageMenu manageMenu) {
         Map<String,Object> resultMap = new HashMap<>();
         if (manageMenu.getName()==null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
             return resultMap;
         }
         if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","���������������������");
+            resultMap.put("code",ResponseCodeEnum.MENU_IS_EXPIRE.getCode());
+            resultMap.put("msg",ResponseCodeEnum.MENU_IS_EXPIRE.getMsg());
         }else {
             manageMenuMapper.insertOne(manageMenu);
-            resultMap.put("flag",true);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+            resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
         }
         return resultMap;
     }
@@ -55,17 +56,17 @@
     public Map<String,Object> updateManageMenu(Map map) {
         Map<String,Object> resultMap = new HashMap<>();
         if (!map.containsKey("id")){
-            resultMap.put("flag",false);
-            resultMap.put("msg","������������������������");
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
             return resultMap;
         }
         if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","���������������������");
+            resultMap.put("code",ResponseCodeEnum.MENU_IS_NULL.getCode());
+            resultMap.put("msg",ResponseCodeEnum.MENU_IS_NULL.getMsg());
         }else {
             manageMenuMapper.updateManageMenuById(map);
-            resultMap.put("flag",true);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+            resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
         }
         return resultMap;
     }
@@ -75,13 +76,13 @@
     public Map<String, Object> deleteManageMenu(Map map) {
         Map<String,Object> resultMap = new HashMap<>();
         if (!map.containsKey("id")){
-            resultMap.put("flag",false);
-            resultMap.put("msg","������������������������");
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
             return resultMap;
         }
         if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","������������������������������������");
+            resultMap.put("code",ResponseCodeEnum.MENU_IS_NULL.getCode());
+            resultMap.put("msg",ResponseCodeEnum.MENU_IS_NULL.getMsg());
         }else {
             Map deleteMap = new HashMap();
             int id = Integer.parseInt(map.get("id").toString());
@@ -91,8 +92,8 @@
             Map role_menuDeleteMap = new HashMap();
             role_menuDeleteMap.put("menu_id",id);
             manageRoleMenuMapper.updateDeleteStateByMenu_id(role_menuDeleteMap);
-            resultMap.put("flag",true);
-            resultMap.put("msg","���������������");
+            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/ManageRoleMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
index 0ce859d..b4dc1f0 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
@@ -1,10 +1,19 @@
 package com.moral.api.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.entity.ManageRoleMenu;
 import com.moral.api.mapper.ManageRoleMenuMapper;
 import com.moral.api.service.ManageRoleMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.ResponseCodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +26,24 @@
 @Service
 public class ManageRoleMenuServiceImpl extends ServiceImpl<ManageRoleMenuMapper, ManageRoleMenu> implements ManageRoleMenuService {
 
+    @Autowired(required = false)
+    private ManageRoleMenuMapper manageRoleMenuMapper;
+
+    @Override
+    @Transactional
+    public Map<String, Object> updateRoleMenu(List list, int id) {
+        Map<String,Object> resultMap = new HashMap<>();
+        if (list.size()==0){
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+            return resultMap;
+        }
+        QueryWrapper<ManageRoleMenu> wrapper = new QueryWrapper();
+        wrapper.eq("role_id",id);
+        System.out.println(manageRoleMenuMapper.selectCount(wrapper));
+        if (manageRoleMenuMapper.selectCount(wrapper)==0){
+
+        }
+        return null;
+    }
 }
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 c71e9ca..deb66a4 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
@@ -10,6 +10,7 @@
 import com.moral.api.service.ManageRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
@@ -67,20 +68,20 @@
     public Map<String,Object> insertOne(ManageRole manageRole,List list) {
         Map<String,Object> resultMap = new HashMap<>();
         if (manageRole.getName()==null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
             return resultMap;
         }
         if (manageRoleMapper.getManageRoleByName(manageRole.getName()) != null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","���������������������");
+            resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXPIRE.getCode());
+            resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXPIRE.getMsg());
         }else {
             manageRoleMapper.insertOne(manageRole);
-            resultMap.put("flag",true);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+            resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
         }
-        boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
-        if (flag){
+        Integer code = Integer.parseInt(resultMap.get("code").toString());
+        if (code.equals(ResponseCodeEnum.SUCCESS.getCode())){
             ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
             int role_id = manageRoleIns.getId();
             System.out.println(role_id);
@@ -102,17 +103,17 @@
     public Map<String,Object> updateManageRole(Map map) {
         Map<String,Object> resultMap = new HashMap<>();
         if (!map.containsKey("id")){
-            resultMap.put("flag",false);
-            resultMap.put("msg","������������������������");
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
             return resultMap;
         }
         if (manageRoleMapper.getManageRoleById(Integer.parseInt(map.get("id").toString())) == null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","���������������������");
+            resultMap.put("code",ResponseCodeEnum.ROLE_IS_NULL.getCode());
+            resultMap.put("msg",ResponseCodeEnum.ROLE_IS_NULL.getMsg());
         }else {
             manageRoleMapper.updateManageRoleById(map);
-            resultMap.put("flag",true);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+            resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
         }
         return resultMap;
     }
@@ -133,13 +134,13 @@
     public Map<String, Object> deleteManageRole(Map map) {
         Map<String,Object> resultMap = new HashMap<>();
         if (!map.containsKey("id")){
-            resultMap.put("flag",false);
-            resultMap.put("msg","������������������������");
+            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
             return resultMap;
         }
         if (manageRoleMapper.getManageRoleById(Integer.parseInt(map.get("id").toString())) == null){
-            resultMap.put("flag",false);
-            resultMap.put("msg","������������������������������������");
+            resultMap.put("code",ResponseCodeEnum.ROLE_IS_NULL.getCode());
+            resultMap.put("msg",ResponseCodeEnum.ROLE_IS_NULL.getMsg());
         }else {
             ManageRole manageRole = new ManageRole();
             manageRole.setId(Integer.parseInt(map.get("id").toString()));
@@ -153,8 +154,8 @@
             QueryWrapper<ManageAccountRole> wrapper = new QueryWrapper();
             wrapper.eq("role_id",Integer.parseInt(map.get("id").toString()));
             manageAccountRoleMapper.update(manageAccountRole,wrapper);
-            resultMap.put("flag",true);
-            resultMap.put("msg","���������������");
+            resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+            resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
         }
         return resultMap;
     }

--
Gitblit v1.8.0