From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/controller/MenuController.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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..258a122 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,13 +6,12 @@
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;
@@ -22,7 +21,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.TokenUtils;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -38,23 +36,15 @@
@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, HttpServletRequest request) {
+ 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);
return ResultMessage.ok();
}
@@ -63,12 +53,11 @@
@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 = "select", method = RequestMethod.POST)
+ public ResultMessage select(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"));
-
- return ResultMessage.ok();
+ return ResultMessage.ok(result);
}
}
--
Gitblit v1.8.0