Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-16 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b

 screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java

@@ -14,6 +14,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -45,13 +46,12 @@
            @ApiImplicitParam(name = "order", value = "同级菜单顺序", required = true, paramType = "query", dataType = "String")
    })
    @RequestMapping(value = "insertOneManageMenu", method = RequestMethod.POST)
    public ResultMessage insertOneManageMenu(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage insertOneManageMenu(@RequestBody Map<String, Object> parameters) {
        ManageMenu manageMenu = JSON.parseObject(JSON.toJSONString(parameters), ManageMenu.class);
        Map<String,Object> resultMap = manageMenuService.insertManageMenu(manageMenu);
        String msg = resultMap.get("msg").toString();
        boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
        if (flag){
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
        }
        return ResultMessage.fail(msg);
@@ -64,28 +64,27 @@
            @ApiImplicitParam(name = "url", value = "url地址", required = true, paramType = "query", dataType = "String")
    })
    @RequestMapping(value = "updateManageMenuById", method = RequestMethod.POST)
    public ResultMessage updateManageMenuById(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    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();
        boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
        if (flag){
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
        }
        return ResultMessage.fail(msg);
    }

    @ApiOperation(value = "删除角色", notes = "删除角色")
    @ApiOperation(value = "删除菜单", notes = "删除菜单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "序号", required = true, paramType = "query", dataType = "int")
    })
    @RequestMapping(value = "deleteManageMenu", method = RequestMethod.POST)
    public ResultMessage deleteManageMenu(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage deleteManageMenu(@RequestBody Map<String, Object> parameters) {
        Map<String,Object> resultMap = manageMenuService.deleteManageMenu(parameters);
        String msg = resultMap.get("msg").toString();
        boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
        if (flag){
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
        }
        return ResultMessage.fail(msg);
@@ -93,8 +92,6 @@

    @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 = "getAllManageMenu", method = RequestMethod.GET)
    public ResultMessage getAllManageMenu(HttpServletRequest request) {
@@ -122,7 +119,7 @@
    })
    @RequestMapping(value = "getManageMenuByNameFuzzy", method = RequestMethod.GET)
    public ResultMessage getManageMenuByNameFuzzy(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        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());
@@ -134,7 +131,54 @@
            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);
    }

    @ApiOperation(value = "通过roleId查询菜单", notes = "通过roleId查询菜单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "roleId", value = "角色id", required = true, paramType = "query", dataType = "int")
    })
    @RequestMapping(value = "getManageMenuByRoleId", method = RequestMethod.GET)
    public ResultMessage getManageMenuByRoleId(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        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);
    }
}