From afd923e3fd718ddde343cd7cb5cc49a8c8e40156 Mon Sep 17 00:00:00 2001
From: stackcn <stacn@qq.com>
Date: Thu, 5 Dec 2024 10:12:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3=E5=92=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新 MenuController 中 listMenuOptions 方法的返回类型为 Result<List<Option<Long>>>- 更新 MenuService 接口中 listMenuOptions 方法的返回类型为 List<Option<Long>>
- 更新 MenuServiceImpl 中 listMenuOptions 和 buildMenuOptions 方法的返回类型为 List<Option<Long>>
- 优化相关方法的参数类型和泛型使用，提高代码可读性
---
 .../youlai/boot/system/controller/MenuController.java  |  4 ++--
 .../com/youlai/boot/system/service/MenuService.java    |  2 +-
 .../boot/system/service/impl/MenuServiceImpl.java      | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/youlai/boot/system/controller/MenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java
index 8fc5ee5a..ce87ebbb 100644
--- a/src/main/java/com/youlai/boot/system/controller/MenuController.java
+++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java
@@ -47,11 +47,11 @@ public class MenuController {
 
     @Operation(summary = "菜单下拉列表")
     @GetMapping("/options")
-    public Result<?> listMenuOptions(
+    public Result<List<Option<Long>>> listMenuOptions(
           @Parameter(description = "是否只查询父级菜单")
           @RequestParam(required = false, defaultValue = "false") boolean onlyParent
     ) {
-        List<Option> menus = menuService.listMenuOptions(onlyParent);
+        List<Option<Long>> menus = menuService.listMenuOptions(onlyParent);
         return Result.success(menus);
     }
 
diff --git a/src/main/java/com/youlai/boot/system/service/MenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java
index cd8624a1..2aa62ed8 100644
--- a/src/main/java/com/youlai/boot/system/service/MenuService.java
+++ b/src/main/java/com/youlai/boot/system/service/MenuService.java
@@ -30,7 +30,7 @@ public interface MenuService extends IService<Menu> {
      *
      * @param onlyParent 是否只查询父级菜单
      */
-    List<Option> listMenuOptions(boolean onlyParent);
+    List<Option<Long>> listMenuOptions(boolean onlyParent);
 
     /**
      * 新增菜单
diff --git a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java
index d8731fa4..582838f8 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java
@@ -106,7 +106,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      * @param onlyParent 是否只查询父级菜单 如果为true，排除按钮
      */
     @Override
-    public List<Option> listMenuOptions(boolean onlyParent) {
+    public List<Option<Long>> listMenuOptions(boolean onlyParent) {
         List<Menu> menuList = this.list(new LambdaQueryWrapper<Menu>()
                 .in(onlyParent, Menu::getType, MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue())
                 .orderByAsc(Menu::getSort)
@@ -121,13 +121,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      * @param menuList 菜单列表
      * @return 菜单下拉列表
      */
-    private List<Option> buildMenuOptions(Long parentId, List<Menu> menuList) {
-        List<Option> menuOptions = new ArrayList<>();
+    private List<Option<Long>> buildMenuOptions(Long parentId, List<Menu> menuList) {
+        List<Option<Long>> menuOptions = new ArrayList<>();
 
         for (Menu menu : menuList) {
             if (menu.getParentId().equals(parentId)) {
-                Option option = new Option(menu.getId(), menu.getName());
-                List<Option> subMenuOptions = buildMenuOptions(menu.getId(), menuList);
+                Option<Long> option = new Option<>(menu.getId(), menu.getName());
+                List<Option<Long>> subMenuOptions = buildMenuOptions(menu.getId(), menuList);
                 if (!subMenuOptions.isEmpty()) {
                     option.setChildren(subMenuOptions);
                 }