tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!11 优化菜单下拉列表相关方法的参数类型和泛型使用

Browse Source 
Merge pull request !11 from stackcn/master
This commit is contained in:
郝先瑞
2024-12-05 02:18:21 +00:00
committed by Gitee
parent e0fd189196 afd923e3fd
commit 7bd17b5a18
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/youlai/boot/system/controller/MenuController.java
View File

@@ -47,11 +47,11 @@ public class MenuController {
@Operation(summary = "菜单下拉列表") @Operation(summary = "菜单下拉列表")
@GetMapping("/options") @GetMapping("/options")
public Result<?> listMenuOptions( public Result<List<Option<Long>>> listMenuOptions(
@Parameter(description = "是否只查询父级菜单") @Parameter(description = "是否只查询父级菜单")
@RequestParam(required = false, defaultValue = "false") boolean onlyParent @RequestParam(required = false, defaultValue = "false") boolean onlyParent
) { ) {
List<Option> menus = menuService.listMenuOptions(onlyParent); List<Option<Long>> menus = menuService.listMenuOptions(onlyParent);
return Result.success(menus); return Result.success(menus);
} }

2
src/main/java/com/youlai/boot/system/service/MenuService.java
View File

@@ -30,7 +30,7 @@ public interface MenuService extends IService<Menu> {
* *
* @param onlyParent 是否只查询父级菜单 * @param onlyParent 是否只查询父级菜单
*/ */
List<Option> listMenuOptions(boolean onlyParent); List<Option<Long>> listMenuOptions(boolean onlyParent);
/** /**
* 新增菜单 * 新增菜单

10
src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java
View File

@@ -106,7 +106,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
* @param onlyParent 是否只查询父级菜单 如果为true，排除按钮 * @param onlyParent 是否只查询父级菜单 如果为true，排除按钮
*/ */
@Override @Override
public List<Option> listMenuOptions(boolean onlyParent) { public List<Option<Long>> listMenuOptions(boolean onlyParent) {
List<Menu> menuList = this.list(new LambdaQueryWrapper<Menu>() List<Menu> menuList = this.list(new LambdaQueryWrapper<Menu>()
.in(onlyParent, Menu::getType, MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue()) .in(onlyParent, Menu::getType, MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue())
.orderByAsc(Menu::getSort) .orderByAsc(Menu::getSort)
@@ -121,13 +121,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
* @param menuList 菜单列表 * @param menuList 菜单列表
* @return 菜单下拉列表 * @return 菜单下拉列表
*/ */
private List<Option> buildMenuOptions(Long parentId, List<Menu> menuList) { private List<Option<Long>> buildMenuOptions(Long parentId, List<Menu> menuList) {
List<Option> menuOptions = new ArrayList<>(); List<Option<Long>> menuOptions = new ArrayList<>();
for (Menu menu : menuList) { for (Menu menu : menuList) {
if (menu.getParentId().equals(parentId)) { if (menu.getParentId().equals(parentId)) {
Option option = new Option(menu.getId(), menu.getName()); Option<Long> option = new Option<>(menu.getId(), menu.getName());
List<Option> subMenuOptions = buildMenuOptions(menu.getId(), menuList); List<Option<Long>> subMenuOptions = buildMenuOptions(menu.getId(), menuList);
if (!subMenuOptions.isEmpty()) { if (!subMenuOptions.isEmpty()) {
option.setChildren(subMenuOptions); option.setChildren(subMenuOptions);
} }