feat(portal): 树形结构接口

- 将 HwWebMenu 类的父类从 BaseEntity 改为 TreeEntity- 移除 HwWebMenu 类中的 children 属性
- 修改 HwWebMenu 类中的 webMenuType 属性类型
- 在 API 中添加 selectMenuTree 方法
- 在控制器中添加 selectMenuTree 方法
- 在服务接口和实现类中添加 selectMenuTree 方法
- 更新 Mapper XML 中的 SQL 语句

ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java

@@ -100,4 +100,12 @@ public class HwWebMenuController extends BaseController
     {
         return toAjax(hwWebMenuService.deleteHwWebMenuByWebMenuIds(webMenuIds));
     }
+
+    /**
+     * 获取菜单树列表
+     */
+    @GetMapping("/selectMenuTree")
+    public AjaxResult selectMenuTree(HwWebMenu hwWebMenu){
+        return success(hwWebMenuService.selectMenuTree(hwWebMenu));
+    }
 }

ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java

@@ -3,7 +3,7 @@ package com.ruoyi.portal.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.core.web.domain.TreeEntity;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @author zch
  * @date 2025-08-18
  */
-public class HwWebMenu extends BaseEntity
+public class HwWebMenu extends TreeEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -24,16 +24,10 @@ public class HwWebMenu extends BaseEntity
     @Excel(name = "父节点")
     private Long parent;
 
-    /** 祖先 */
-    @Excel(name = "祖先")
-    private String ancestors;
-
     /** 状态 */
     @Excel(name = "状态")
     private String status;
 
-    private int webMenuType;
-
     /** 菜单名称 */
     @Excel(name = "菜单名称")
     private String webMenuName;
@@ -46,7 +40,9 @@ public class HwWebMenu extends BaseEntity
     @Excel(name = "图片地址")
     private String webMenuPic;
 
-    private List<HwWebMenu> children;
+    /** 官网菜单类型 */
+    @Excel(name = "官网菜单类型")
+    private Long webMenuType;
 
     public void setWebMenuId(Long webMenuId)
     {
@@ -66,15 +62,6 @@ public class HwWebMenu extends BaseEntity
     {
         return parent;
     }
-    public void setAncestors(String ancestors) 
-    {
-        this.ancestors = ancestors;
-    }
-
-    public String getAncestors() 
-    {
-        return ancestors;
-    }
     public void setStatus(String status)
     {
         this.status = status;
@@ -111,34 +98,27 @@ public class HwWebMenu extends BaseEntity
     {
         return webMenuPic;
     }
-
-    public List<HwWebMenu> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<HwWebMenu> children) {
-        this.children = children;
-    }
-
-    public int getWebMenuType() {
-        return webMenuType;
-    }
-
-    public void setWebMenuType(int webMenuType) {
+    public void setWebMenuType(Long webMenuType)
+    {
         this.webMenuType = webMenuType;
     }
 
+    public Long getWebMenuType()
+    {
+        return webMenuType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("webMenuId", getWebMenuId())
-            .append("parent", getParent())
-            .append("ancestors", getAncestors())
-            .append("status", getStatus())
-            .append("webMenuName", getWebMenuName())
-            .append("tenantId", getTenantId())
-            .append("webMenuPic", getWebMenuPic())
-            .append("webMenuType", getWebMenuType())
-            .toString();
+                .append("webMenuId", getWebMenuId())
+                .append("parent", getParent())
+                .append("ancestors", getAncestors())
+                .append("status", getStatus())
+                .append("webMenuName", getWebMenuName())
+                .append("tenantId", getTenantId())
+                .append("webMenuPic", getWebMenuPic())
+                .append("webMenuType", getWebMenuType())
+                .toString();
     }
 }

ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService.java

@@ -58,4 +58,11 @@ public interface IHwWebMenuService
      * @return 结果
      */
     public int deleteHwWebMenuByWebMenuId(Long webMenuId);
+
+
+    /**
+     * 获取菜单树列表
+     */
+    public List<HwWebMenu> selectMenuTree(HwWebMenu hwWebMenu);
+
 }

ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java

@@ -45,6 +45,16 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService
      */
     @Override
     public List<HwWebMenu> selectHwWebMenuList(HwWebMenu hwWebMenu)
+    {
+        List<HwWebMenu> hwWebMenus = hwWebMenuMapper.selectHwWebMenuList(hwWebMenu);
+        return hwWebMenus;
+    }
+
+    /**
+     * 获取菜单树列表
+     */
+    @Override
+    public List<HwWebMenu> selectMenuTree(HwWebMenu hwWebMenu)
     {
         List<HwWebMenu> hwWebMenus = hwWebMenuMapper.selectHwWebMenuList(hwWebMenu);
         return buildWebMenuTree(hwWebMenus);

ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMenuMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.portal.mapper.HwWebMenuMapper">
 
     <resultMap type="HwWebMenu" id="HwWebMenuResult">
@@ -16,11 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectHwWebMenuVo">
-        select web_menu_id, parent,
-               ancestors, status, web_menu_name,
-               tenant_id, web_menu__pic ,
-            web_menu_type
-        from hw_web_menu
+        select web_menu_id, parent, ancestors, status, web_menu_name, tenant_id, web_menu__pic, web_menu_type from hw_web_menu
     </sql>
 
     <select id="selectHwWebMenuList" parameterType="HwWebMenu" resultMap="HwWebMenuResult">
@@ -31,8 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="webMenuName != null  and webMenuName != ''"> and web_menu_name like concat('%', #{webMenuName}, '%')</if>
             <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
-             <if test="webMenuType != null "> and web_menu_type = #{webMenuType}</if>
             <if test="webMenuPic != null  and webMenuPic != ''"> and web_menu__pic = #{webMenuPic}</if>
+            <if test="webMenuType != null "> and web_menu_type = #{webMenuType}</if>
         </where>
     </select>
 
@@ -52,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenantId != null">tenant_id,</if>
             <if test="webMenuPic != null">web_menu__pic,</if>
             <if test="webMenuType != null">web_menu_type,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="webMenuId != null">#{webMenuId},</if>
             <if test="parent != null">#{parent},</if>
@@ -62,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenantId != null">#{tenantId},</if>
             <if test="webMenuPic != null">#{webMenuPic},</if>
             <if test="webMenuType != null">#{webMenuType},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateHwWebMenu" parameterType="HwWebMenu">

ruoyi-ui/src/api/portal/hwWebMenu.js

@@ -42,3 +42,11 @@ export function delHwWebMenu(webMenuId) {
     method: 'delete'
   })
 }
+
+export function selectMenuTree(query) {
+  return request({
+    url: '/portal/hwWebMenu/selectMenuTree',
+    method: 'get',
+    params: query
+  })
+}