Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 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());
@@ -130,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);
    }

@@ -153,7 +154,42 @@
    @RequestMapping(value = "getManageMenuList", method = RequestMethod.GET)
    public ResultMessage getManageMenuList(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        List<ManageMenu> result = manageMenuService.getAllWithPagingQuery(parameters);
        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);
    }
}