diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/system/controller/SysMenuController.java index eca46f41..7113cf35 100644 --- a/src/main/java/com/youlai/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/system/controller/SysMenuController.java @@ -3,6 +3,7 @@ package com.youlai.system.controller; import com.youlai.system.common.model.Option; import com.youlai.system.common.result.Result; import com.youlai.system.pojo.entity.SysMenu; +import com.youlai.system.pojo.query.MenuQuery; import com.youlai.system.pojo.vo.menu.MenuVO; import com.youlai.system.pojo.vo.menu.ResourceVO; import com.youlai.system.pojo.vo.menu.RouteVO; @@ -42,10 +43,8 @@ public class SysMenuController { @ApiOperation(value = "菜单列表") @GetMapping - public Result listMenus( - @ApiParam("菜单名称") String name - ) { - List menuList = menuService.listMenus(name); + public Result listMenus(MenuQuery queryParams) { + List menuList = menuService.listMenus(queryParams); return Result.success(menuList); } diff --git a/src/main/java/com/youlai/system/pojo/query/DeptQuery.java b/src/main/java/com/youlai/system/pojo/query/DeptQuery.java index fef4c268..14c206d1 100644 --- a/src/main/java/com/youlai/system/pojo/query/DeptQuery.java +++ b/src/main/java/com/youlai/system/pojo/query/DeptQuery.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 部门分页查询对象 + * 部门查询对象 * * @author haoxr * @date 2022/6/11 diff --git a/src/main/java/com/youlai/system/pojo/query/MenuQuery.java b/src/main/java/com/youlai/system/pojo/query/MenuQuery.java new file mode 100644 index 00000000..b75242dd --- /dev/null +++ b/src/main/java/com/youlai/system/pojo/query/MenuQuery.java @@ -0,0 +1,23 @@ +package com.youlai.system.pojo.query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 菜单查询对象 + * + * @author haoxr + * @date 2022/10/28 + */ +@ApiModel("部门分页查询对象") +@Data +public class MenuQuery { + + @ApiModelProperty("关键字(菜单名称)") + private String keywords; + + @ApiModelProperty("状态(1->显示;0->隐藏)") + private Integer status; + +} diff --git a/src/main/java/com/youlai/system/service/SysMenuService.java b/src/main/java/com/youlai/system/service/SysMenuService.java index 36f02169..e2ce3463 100644 --- a/src/main/java/com/youlai/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/system/service/SysMenuService.java @@ -3,6 +3,7 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.system.common.model.Option; import com.youlai.system.pojo.entity.SysMenu; +import com.youlai.system.pojo.query.MenuQuery; import com.youlai.system.pojo.vo.menu.MenuVO; import com.youlai.system.pojo.vo.menu.ResourceVO; import com.youlai.system.pojo.vo.menu.RouteVO; @@ -21,10 +22,9 @@ public interface SysMenuService extends IService { /** * 获取菜单表格列表 * - * @param name 菜单名称 * @return */ - List listMenus(String name); + List listMenus(MenuQuery queryParams); /** diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index f90865c9..e42e8ee6 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -14,6 +14,7 @@ import com.youlai.system.converter.MenuConverter; import com.youlai.system.mapper.SysMenuMapper; import com.youlai.system.pojo.entity.SysMenu; import com.youlai.system.pojo.po.RoutePO; +import com.youlai.system.pojo.query.MenuQuery; import com.youlai.system.pojo.vo.menu.MenuVO; import com.youlai.system.pojo.vo.menu.ResourceVO; import com.youlai.system.pojo.vo.menu.RouteVO; @@ -42,9 +43,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl * 菜单表格树形列表 */ @Override - public List listMenus(String name) { + public List listMenus(MenuQuery queryParams) { List menus = this.list(new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(name), SysMenu::getName, name) + .like(StrUtil.isNotBlank(queryParams.getKeywords()), SysMenu::getName, queryParams.getKeywords()) .orderByAsc(SysMenu::getSort) );