From 65e3f717efd4dfcccae8b873b92beac00e2ac83f Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 2 Aug 2024 00:41:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=9F=E6=88=90=E8=8F=9C=E5=8D=95=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysMenuController.java  |  7 +++-
 .../youlai/system/service/SysMenuService.java | 10 +++--
 .../service/impl/GeneratorServiceImpl.java    |  5 ++-
 .../service/impl/SysMenuServiceImpl.java      | 38 ++++++++++++++-----
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/system/controller/SysMenuController.java
index db10e971..6a63b2af 100644
--- a/src/main/java/com/youlai/system/controller/SysMenuController.java
+++ b/src/main/java/com/youlai/system/controller/SysMenuController.java
@@ -47,8 +47,11 @@ public class SysMenuController {
 
     @Operation(summary = "菜单下拉列表")
     @GetMapping("/options")
-    public Result listMenuOptions() {
-        List<Option> menus = menuService.listMenuOptions();
+    public Result listMenuOptions(
+          @Parameter(description = "是否只查询父级菜单")
+          @RequestParam(required = false, defaultValue = "false") boolean onlyParent
+    ) {
+        List<Option> menus = menuService.listMenuOptions(onlyParent);
         return Result.success(menus);
     }
 
diff --git a/src/main/java/com/youlai/system/service/SysMenuService.java b/src/main/java/com/youlai/system/service/SysMenuService.java
index f084c223..b55a2369 100644
--- a/src/main/java/com/youlai/system/service/SysMenuService.java
+++ b/src/main/java/com/youlai/system/service/SysMenuService.java
@@ -1,6 +1,7 @@
 package com.youlai.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.youlai.system.model.entity.GenConfig;
 import com.youlai.system.model.form.MenuForm;
 import com.youlai.system.common.model.Option;
 import com.youlai.system.model.entity.SysMenu;
@@ -24,11 +25,12 @@ public interface SysMenuService extends IService<SysMenu> {
      */
     List<MenuVO> listMenus(MenuQuery queryParams);
 
-
     /**
      * 获取菜单下拉列表
+     *
+     * @param onlyParent 是否只查询父级菜单
      */
-    List<Option> listMenuOptions();
+    List<Option> listMenuOptions(boolean onlyParent);
 
     /**
      * 新增菜单
@@ -68,7 +70,7 @@ public interface SysMenuService extends IService<SysMenu> {
      * 为代码生成添加菜单
      *
      * @param parentMenuId 父菜单ID
-     * @param entityName   实体名
+     * @param genConfig   实体名
      */
-    void addMenuForCodeGeneration(Long parentMenuId,String businessName, String entityName);
+    void saveMenu(Long parentMenuId, GenConfig genConfig);
 }
diff --git a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
index d8c72318..f216ba86 100644
--- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
@@ -101,7 +101,8 @@ public class GeneratorServiceImpl implements GeneratorService {
             genConfig.setEntityName(entityName);
 
             String packageName = SystemApplication.class.getPackageName();
-            genConfig.setPackageName(packageName);
+            genConfig.setPackageName( StrUtil.subBefore(packageName, ".", true));
+            genConfig.setModuleName(StrUtil.subAfter(packageName, ".", true));
 
             genConfig.setAuthor(generatorProperties.getDefaultConfig().getAuthor());
 
@@ -177,7 +178,7 @@ public class GeneratorServiceImpl implements GeneratorService {
         // 如果选择上级菜单
         Long parentMenuId = formData.getParentMenuId();
         if (parentMenuId != null) {
-            menuService.addMenuForCodeGeneration(parentMenuId,genConfig.getBusinessName(),genConfig.getEntityName());
+            menuService.saveMenu(parentMenuId,genConfig);
         }
 
         List<GenFieldConfig> genFieldConfigs = genConfigConverter.toGenFieldConfig(formData.getFieldConfigs());
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 65b968ed..b6f859d3 100644
--- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
@@ -18,6 +18,7 @@ import com.youlai.system.common.model.Option;
 import com.youlai.system.converter.MenuConverter;
 import com.youlai.system.mapper.SysMenuMapper;
 import com.youlai.system.model.bo.RouteBO;
+import com.youlai.system.model.entity.GenConfig;
 import com.youlai.system.model.entity.SysMenu;
 import com.youlai.system.model.form.MenuForm;
 import com.youlai.system.model.query.MenuQuery;
@@ -102,11 +103,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 
     /**
      * 菜单下拉数据
+     *
+     * @param onlyParent 是否只查询父级菜单 如果为true，排除按钮
      */
     @Override
-    public List<Option> listMenuOptions() {
+    public List<Option> listMenuOptions(boolean onlyParent) {
         List<SysMenu> menuList = this.list(new LambdaQueryWrapper<SysMenu>()
-                .orderByAsc(SysMenu::getSort));
+                .in(onlyParent, SysMenu::getType, MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue())
+                .orderByAsc(SysMenu::getSort)
+        );
         return buildMenuOptions(SystemConstants.ROOT_NODE_ID, menuList);
     }
 
@@ -355,27 +360,40 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      * 为代码生成添加菜单
      *
      * @param parentMenuId 父菜单ID
-     * @param entityName   实体名称
+     * @param genConfig    实体名称
      */
     @Override
-    public void addMenuForCodeGeneration(Long parentMenuId, String businessName, String entityName) {
+    public void saveMenu(Long parentMenuId, GenConfig genConfig) {
         SysMenu parentMenu = this.getById(parentMenuId);
-        Assert.notNull(parentMenu, "父菜单不存在");
+        Assert.notNull(parentMenu, "上级菜单不存在");
+
+        String entityName = genConfig.getEntityName();
 
         long count = this.count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getRouteName, entityName));
         if (count > 0) {
             return;
         }
 
+        // 获取父级菜单子菜单最带的排序
+        SysMenu maxSortMenu = this.getOne(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, parentMenuId)
+                .orderByDesc(SysMenu::getSort)
+                .last("limit 1")
+        );
+        int sort = 1;
+        if (maxSortMenu != null) {
+            sort = maxSortMenu.getSort() + 1;
+        }
+
+
         SysMenu menu = new SysMenu();
         menu.setParentId(parentMenuId);
-        menu.setName(businessName);
+        menu.setName(genConfig.getBusinessName());
 
         menu.setRouteName(entityName);
-        menu.setRoutePath(StrUtil.toUnderlineCase(entityName));
-        menu.setComponent(StrUtil.toUnderlineCase(entityName) + "/index");
-        menu.setType(MenuTypeEnum.CATALOG);
-        menu.setSort(0);
+        menu.setRoutePath(StrUtil.toSymbolCase(entityName, '-'));
+        menu.setComponent(genConfig.getModuleName() + "/" + StrUtil.toSymbolCase(entityName, '-') + "/index");
+        menu.setType(MenuTypeEnum.MENU);
+        menu.setSort(sort);
         menu.setVisible(1);
         boolean result = this.save(menu);