From ed74d6073f693417395043fed8ad0edf5c201816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=80=A1?= <jl-liuc59@chinaunicom.cn>
Date: Sat, 26 Jul 2025 11:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E5=85=B8=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=96=B0=E5=A2=9Epath?=
 =?UTF-8?q?=E5=92=8CpathName=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E6=9E=84=E5=BB=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81=E8=B7=AF=E5=BE=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dict/dao/mapper/DictRegionMapper.xml      |  6 ++-
 .../system/dict/entity/DictRegionTreeVO.java  | 12 +++++
 .../service/impl/DictRegionServiceImpl.java   | 50 ++++++++++++++++++-
 .../ebtp/system/dict/util/TreeUtil.java       |  2 +
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml
index 359fcfa..6c288e2 100644
--- a/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml
+++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml
@@ -9,6 +9,8 @@
             <result column="name"  jdbcType="VARCHAR" property="name"/>
             <result column="level"  jdbcType="VARCHAR" property="level"/>
             <result column="ab"  jdbcType="VARCHAR" property="ab"/>
+            <result column="path"  jdbcType="VARCHAR" property="path"/>
+            <result column="path_name"  jdbcType="VARCHAR" property="pathName"/>
     </resultMap>
 
     <!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
@@ -23,14 +25,14 @@
     <select id="getAllChildrenIncludingSelf" resultMap="BaseResultMap">
         WITH RECURSIVE region_tree AS (
             -- 基础查询：查询当前节点
-            SELECT id, p_id, name, level, ab
+            SELECT id, p_id, name, level, ab, path, path_name
             FROM dict_region
             WHERE id = #{id}
 
             UNION ALL
 
             -- 递归查询：查询所有子节点
-            SELECT dr.id, dr.p_id, dr.name, dr.level, dr.ab
+            SELECT dr.id, dr.p_id, dr.name, dr.level, dr.ab, dr.path, dr.path_name
             FROM dict_region dr
             INNER JOIN region_tree rt ON dr.p_id = rt.id
         )
diff --git a/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java
index 71d49e1..c32e250 100644
--- a/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java
+++ b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java
@@ -51,6 +51,18 @@ public class DictRegionTreeVO implements Serializable {
     @ApiModelProperty(value = "缩写")
     private String ab;
 
+    /**
+     * ID路径，逗号分隔
+     */
+    @ApiModelProperty(value = "ID路径，逗号分隔")
+    private String path;
+
+    /**
+     * 名称路径，逗号分隔
+     */
+    @ApiModelProperty(value = "名称路径，逗号分隔")
+    private String pathName;
+
     /**
      * 子节点列表
      */
diff --git a/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionServiceImpl.java
index 857211b..b4359fd 100644
--- a/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionServiceImpl.java
+++ b/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionServiceImpl.java
@@ -70,6 +70,9 @@ public class DictRegionServiceImpl extends BaseServiceImpl<DictRegionMapper, Dic
             return null;
         }
 
+        // 初始化所有节点的path和pathName字段
+        initPathAndPathName(allChildren, current);
+
         // 构建父ID到子节点的映射，提高查找效率
         Map<String, List<DictRegion>> parentToChildrenMap = new HashMap<>();
         for (DictRegion node : allChildren) {
@@ -80,8 +83,47 @@ public class DictRegionServiceImpl extends BaseServiceImpl<DictRegionMapper, Dic
         return buildTreeFromMap(current, parentToChildrenMap, 0);
     }
 
+    /**
+     * 初始化所有节点的path和pathName字段
+     *
+     * @param allChildren 所有子节点列表
+     * @param root        根节点
+     */
+    private void initPathAndPathName(List<DictRegion> allChildren, DictRegion root) {
+        // 创建ID到节点的映射
+        Map<String, DictRegion> idToNodeMap = new HashMap<>();
+        for (DictRegion node : allChildren) {
+            idToNodeMap.put(node.getId(), node);
+        }
+
+        // 初始化根节点的path和pathName
+        root.setPath(root.getId());
+        root.setPathName(root.getName());
+
+        // BFS遍历设置所有子节点的path和pathName
+        List<DictRegion> queue = new ArrayList<>();
+        queue.add(root);
+
+        while (!queue.isEmpty()) {
+            DictRegion currentNode = queue.remove(0);
+            String currentPath = currentNode.getPath();
+            String currentPathName = currentNode.getPathName();
+
+            // 查找当前节点的所有直接子节点
+            for (DictRegion node : allChildren) {
+                if (currentNode.getId().equals(node.getPId())) {
+                    // 设置子节点的path和pathName
+                    node.setPath(currentPath + "," + node.getId());
+                    node.setPathName(currentPathName + "," + node.getName());
+                    queue.add(node);
+                }
+            }
+        }
+    }
+
     /**
      * Java版本递归查询所有下级数据（包括自己）
+     *
      * @param id 当前节点ID
      * @return 所有下级数据列表
      */
@@ -101,6 +143,7 @@ public class DictRegionServiceImpl extends BaseServiceImpl<DictRegionMapper, Dic
 
     /**
      * 递归查询所有子节点
+     *
      * @param parentId 父节点ID
      * @return 所有子节点列表
      */
@@ -124,9 +167,10 @@ public class DictRegionServiceImpl extends BaseServiceImpl<DictRegionMapper, Dic
 
     /**
      * 从Map中构建树形结构（内存中处理，使用Map提高效率）
-     * @param rootNode 根节点
+     *
+     * @param rootNode            根节点
      * @param parentToChildrenMap 父ID到子节点的映射
-     * @param depth 当前深度
+     * @param depth               当前深度
      * @return 树形结构节点
      */
     private DictRegionTreeVO buildTreeFromMap(DictRegion rootNode, Map<String, List<DictRegion>> parentToChildrenMap, int depth) {
@@ -136,6 +180,8 @@ public class DictRegionServiceImpl extends BaseServiceImpl<DictRegionMapper, Dic
                 .setName(rootNode.getName())
                 .setLevel(rootNode.getLevel())
                 .setAb(rootNode.getAb())
+                .setPath(rootNode.getPath())
+                .setPathName(rootNode.getPathName())
                 .setDepth(depth);
 
         // 从Map中获取当前节点的直接子节点
diff --git a/src/main/java/com/coscoshipping/ebtp/system/dict/util/TreeUtil.java b/src/main/java/com/coscoshipping/ebtp/system/dict/util/TreeUtil.java
index 01c7194..6025cbd 100644
--- a/src/main/java/com/coscoshipping/ebtp/system/dict/util/TreeUtil.java
+++ b/src/main/java/com/coscoshipping/ebtp/system/dict/util/TreeUtil.java
@@ -57,6 +57,8 @@ public class TreeUtil {
                     .setName(child.getName())
                     .setLevel(child.getLevel())
                     .setAb(child.getAb())
+                    .setPath(child.getPath())
+                    .setPathName(child.getPathName())
                     .setDepth(depth);
 
             // 递归构建子节点