From a489b023d9ca2a24dfe82d05f19cac8718aa5c13 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 15 Apr 2021 11:38:09 +0800
Subject: [PATCH] 添加查询菜单列表功能

---
 screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 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 c9d1342..69fced5 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) {
@@ -122,7 +118,7 @@
     })
     @RequestMapping(value = "getManageMenuByNameFuzzy", method = RequestMethod.GET)
     public ResultMessage getManageMenuByNameFuzzy(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Map<String,Object> parameters = getParametersStartingWith(request,null);
         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());
@@ -137,4 +133,27 @@
         List<ManageMenu> re = manageMenuService.getManageMenuByNameFuzzy(parameters);
         return ResultMessage.ok(re);
     }
+
+    @ApiOperation(value = "������roleId������������", notes = "������roleId������������")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roleId", value = "������id", required = true, paramType = "query", dataType = "int")
+    })
+    @RequestMapping(value = "getManageMenuByRoleId", method = RequestMethod.GET)
+    public ResultMessage getManageMenuByRoleId(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<ManageMenu> result = manageMenuService.getManageMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
+        return ResultMessage.ok(result);
+    }
+
+    @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 = "getManageMenuList", method = RequestMethod.GET)
+    public ResultMessage getManageMenuList(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<ManageMenu> result = manageMenuService.getAllWithPagingQuery(parameters);
+        return ResultMessage.ok(result);
+    }
 }

--
Gitblit v1.8.0