From 3b29244703787dda85386167dca4126b5b0f150c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 13:58:34 +0800
Subject: [PATCH] screen-api 添加查询五分钟数据接口以及查询国控站位置接口
---
screen-api/src/main/java/com/moral/api/controller/MenuController.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 3d62c7b..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
@@ -19,15 +19,13 @@
import com.moral.api.entity.Menu;
import com.moral.api.service.GroupMenuService;
-import com.moral.api.service.GroupService;
import com.moral.api.service.MenuService;
-import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.TokenUtils;
@Slf4j
-@Api(tags = {"������"})
+@Api(tags = {"������������"})
@RestController
@RequestMapping("/menu")
public class MenuController {
@@ -38,25 +36,17 @@
@Autowired
private MenuService menuService;
- @Autowired
- private GroupService groupService;
-
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
@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);
-
- String groupName = groupService.getById((Integer) parameters.get("groupId")).getGroupName();
- String content = "������<" + groupName + ">���������������";
- OperationLogUtils.insertLog(request, content);
+ groupMenuService.allotMenus(parameters);
return ResultMessage.ok();
}
@@ -77,7 +67,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
})
- @RequestMapping(value = "select", method = RequestMethod.POST)
+ @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);
@@ -90,8 +80,8 @@
@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){
+ @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