From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +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 | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 258a122..0a9fd19 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,6 +6,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -16,6 +17,7 @@
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;
@@ -39,17 +41,29 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "allot", method = RequestMethod.POST)
- public ResultMessage allot(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ 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");
- 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 = "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> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ List<Menu> menus = menuService.getMenuList((Integer) orgInfo.get("id"));
+ return ResultMessage.ok(menus);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
})
@@ -57,7 +71,18 @@
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"));
+ 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 = "get-menu-ids", method = RequestMethod.GET)
+ public ResultMessage getMenuIds(Integer groupId) {
+ List<Integer> menusIds = groupMenuService.getMenusIds(groupId);
+ return ResultMessage.ok(menusIds);
+ }
}
--
Gitblit v1.8.0