From e4ebf74baef4faab3fa794c042e2921437525e6e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 10:40:52 +0800
Subject: [PATCH] update

---
 screen-api/src/main/java/com/moral/api/controller/MenuController.java |   60 +++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/MenuController.java b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
index ecb36f9..7ae682a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MenuController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
@@ -6,26 +6,26 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
 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;
 
+import com.moral.api.entity.Menu;
 import com.moral.api.service.GroupMenuService;
 import com.moral.api.service.MenuService;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import com.moral.util.TokenUtils;
-import com.moral.util.WebUtils;
 
 @Slf4j
-@Api(tags = {"������"})
+@Api(tags = {"������������"})
 @RestController
 @RequestMapping("/menu")
 public class MenuController {
@@ -38,37 +38,51 @@
 
     @ApiOperation(value = "���������������", notes = "���������������")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "groupId", value = "���id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "menuIds", value = "������id,������������������", required = true, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    @RequestMapping(value = "allotMenus", method = RequestMethod.POST)
-    public ResultMessage allotMenus(HttpServletRequest request) {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        if (!parameters.containsKey("userId")) {
-            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+    @RequestMapping(value = "allot", method = RequestMethod.POST)
+    public ResultMessage allot(@RequestBody Map<String, Object> parameters) {
+        if (!parameters.containsKey("groupId")) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        String token = request.getHeader("token");
-        String[] menuIds = parameters.get("menuIds").toString().split(",");
-        List<Integer> mIds = new ArrayList<>();
-        for (String menuId : menuIds) {
-            mIds.add(Integer.parseInt(menuId));
-        }
-        parameters.put("menuIds", mIds);
-        groupMenuService.allotMenus(parameters, token);
+        groupMenuService.allotMenus(parameters);
         return ResultMessage.ok();
     }
 
-    @ApiOperation(value = "������������������������", notes = "������������������������")
+    @ApiOperation(value = "������������", notes = "������������")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
     })
-    @RequestMapping(value = "selectGroups", method = RequestMethod.POST)
-    public ResultMessage selectGroups(HttpServletRequest request) {
+    @RequestMapping(value = "menu-list", method = RequestMethod.POST)
+    public ResultMessage selectMenus(HttpServletRequest request) {
         String token = request.getHeader("token");
         Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
-        Map<String, Object> result = menuService.selectMenusByOrgId((Integer) currentUserInfo.get("organizationId"));
+        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+        List<Menu> menus = menuService.getMenuList((Integer) orgInfo.get("id"));
+        return ResultMessage.ok(menus);
+    }
 
-        return ResultMessage.ok();
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+    })
+    @RequestMapping(value = "select", method = RequestMethod.GET)
+    public ResultMessage select(HttpServletRequest request) {
+        String token = request.getHeader("token");
+        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+        Map<String, Object> result = menuService.selectMenusByOrgId((Integer) orgInfo.get("id"));
+        return ResultMessage.ok(result);
+    }
+
+    @ApiOperation(value = "���������������ids", notes = "���������������ids")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+    })
+    @RequestMapping(value = "getMenuIds", method = RequestMethod.GET)
+    public ResultMessage getMenuIds(Integer groupId) {
+        List<Integer> menusIds = groupMenuService.getMenusIds(groupId);
+        return ResultMessage.ok(menusIds);
     }
 }

--
Gitblit v1.8.0