From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/controller/MenuController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 1ee1f1a..2e2eaf0 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,9 +6,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+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;
@@ -16,6 +15,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;
@@ -23,7 +23,7 @@
import com.moral.util.TokenUtils;
@Slf4j
-@Api(tags = {"������"})
+@Api(tags = {"������������"})
@RestController
@RequestMapping("/menu")
public class MenuController {
@@ -38,26 +38,47 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "allotMenus", method = RequestMethod.POST)
- public ResultMessage allotMenus(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ @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");
- 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) {
- 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"));
+ @RequestMapping(value = "menu-list", method = RequestMethod.POST)
+ public ResultMessage selectMenus() {
+ Map<String, Object> currentUserInfo = (Map<String, Object>)TokenUtils.getUserInfo();
+ 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"),
+ })
+ @RequestMapping(value = "select", method = RequestMethod.GET)
+ public ResultMessage select() {
+ Map<String, Object> currentUserInfo = (Map<String, Object>)TokenUtils.getUserInfo();
+ 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