From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
index 794c7d3..ebe54ef 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -30,7 +30,7 @@
@Slf4j
@Api(tags = {"������"})
@RestController
-@RequestMapping("/menu")
+@RequestMapping("/manageMenu")
public class ManageMenuController {
@Autowired
@@ -65,6 +65,7 @@
})
@RequestMapping(value = "updateManageMenuById", method = RequestMethod.POST)
public ResultMessage updateManageMenuById(@RequestBody Map<String, Object> parameters) {
+ System.out.println("parameters:"+parameters);
Map<String,Object> resultMap = manageMenuService.updateManageMenu(parameters);
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
@@ -117,7 +118,8 @@
@ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
})
@RequestMapping(value = "getManageMenuByNameFuzzy", method = RequestMethod.GET)
- public ResultMessage getManageMenuByNameFuzzy(@RequestBody Map<String, Object> parameters) {
+ public ResultMessage getManageMenuByNameFuzzy(HttpServletRequest request) {
+ Map<String,Object> parameters = getParametersStartingWith(request,null);
Map<String,Object> resultMap = new HashMap<>();
if (parameters.get("name") == null || parameters.get("current") == null || parameters.get("size") == null){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
@@ -129,7 +131,7 @@
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
return ResultMessage.fail(resultMap);
}
- List<ManageMenu> re = manageMenuService.getManageMenuByNameFuzzy(parameters);
+ List<Map<String,Object>> re = manageMenuService.getManageMenuByNameFuzzy(parameters);
return ResultMessage.ok(re);
}
@@ -143,4 +145,51 @@
List<ManageMenu> result = manageMenuService.getManageMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
return ResultMessage.ok(result);
}
+
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
+ })
+ @RequestMapping(value = "getManageMenuList", method = RequestMethod.GET)
+ public ResultMessage getManageMenuList(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Map<String,Object>> result = manageMenuService.getAllWithPagingQuery(parameters);
+ return ResultMessage.ok(result);
+ }
+
+ @ApiOperation(value = "������������������������������", notes = "������������������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "parent_id", value = "���������id", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
+ })
+ @RequestMapping(value = "getManageMenuByParentId", method = RequestMethod.GET)
+ public ResultMessage getManageMenuByParentId(HttpServletRequest request) {
+ Map<String,Object> parameters = getParametersStartingWith(request,null);
+ Map<String,Object> resultMap = new HashMap<>();
+ if (parameters.get("parent_id") == null || parameters.get("current") == null || parameters.get("size") == null){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return ResultMessage.fail(resultMap);
+ }
+ if (Integer.parseInt(parameters.get("current").toString())<1 || Integer.parseInt(parameters.get("size").toString())<1){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
+ return ResultMessage.fail(resultMap);
+ }
+ List<Map<String,Object>> re = manageMenuService.getManageMenuByParentId(parameters);
+ return ResultMessage.ok(re);
+ }
+
+ @ApiOperation(value = "������roleId������������", notes = "������roleId������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "roleId", value = "������id", required = true, paramType = "query", dataType = "int")
+ })
+ @RequestMapping(value = "getManageChildMenuByRoleId", method = RequestMethod.GET)
+ public ResultMessage getManageChildMenuByRoleId(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<ManageMenu> result = manageMenuService.getManageChildMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
+ return ResultMessage.ok(result);
+ }
}
--
Gitblit v1.8.0