From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 25 Aug 2023 14:12:48 +0800 Subject: [PATCH] chore:过滤海城小时数据 --- screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 64 +++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 13 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 fc71ae0..0a8a6b5 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 @@ -52,9 +52,9 @@ String msg = resultMap.get("msg").toString(); int code = Integer.parseInt(resultMap.get("code").toString()); if (code == 0){ - return ResultMessage.ok(msg); + return ResultMessage.ok(code,msg); } - return ResultMessage.fail(msg); + return ResultMessage.fail(code,msg); } @ApiOperation(value = "������������", notes = "������������") @@ -70,9 +70,9 @@ String msg = resultMap.get("msg").toString(); int code = Integer.parseInt(resultMap.get("code").toString()); if (code == 0){ - return ResultMessage.ok(msg); + return ResultMessage.ok(code,msg); } - return ResultMessage.fail(msg); + return ResultMessage.fail(code,msg); } @ApiOperation(value = "������������", notes = "������������") @@ -85,9 +85,9 @@ String msg = resultMap.get("msg").toString(); int code = Integer.parseInt(resultMap.get("code").toString()); if (code == 0){ - return ResultMessage.ok(msg); + return ResultMessage.ok(code,msg); } - return ResultMessage.fail(msg); + return ResultMessage.fail(code,msg); } @ApiOperation(value = "������������������", notes = "������������������") @@ -121,17 +121,12 @@ 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()); - 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<ManageMenu> re = manageMenuService.getManageMenuByNameFuzzy(parameters); + Map<String,Object> re = manageMenuService.getManageMenuByCondition(parameters); return ResultMessage.ok(re); } @@ -157,4 +152,47 @@ 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); + } + + @ApiOperation(value = "���������������������", notes = "���������������������") + @RequestMapping(value = "getManageParentMenu", method = RequestMethod.GET) + public ResultMessage getManageParentMenu(HttpServletRequest request) { + Map<String, Object> parameters = getParametersStartingWith(request, null); + Map<String,Object> result = manageMenuService.getManageParentMenu(parameters); + return ResultMessage.ok(result); + } } -- Gitblit v1.8.0