From c7ab98f8a8a8bae7cc2b7d1ff4a285e6bd43bb3c Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 15 Jun 2022 17:43:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BA=A7=E8=81=94=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/utils/LouDongTreeNodeUtils.java  |  2 +-
 .../epmet/commons/tools/utils/LoudongTreeNode.java |  8 ++++----
 .../dto/result/LouDongCascadeResultDTO.java        | 14 ++------------
 .../src/main/resources/mapper/CaLoudongDao.xml     | 13 +++++--------
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java
index 3c92b6865b..36f7d62ab1 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java
@@ -14,7 +14,7 @@ public class LouDongTreeNodeUtils {
         List<T> result = new ArrayList<>();
 
         //list转map
-        Map<Long, T> nodeMap = new LinkedHashMap<>(treeNodes.size());
+        Map<String, T> nodeMap = new LinkedHashMap<>(treeNodes.size());
         for(T treeNode : treeNodes){
             nodeMap.put(treeNode.getId(), treeNode);
         }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java
index f25d7638a5..e4c77467a8 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java
@@ -10,7 +10,7 @@ public class LoudongTreeNode<T> implements Serializable {
     /**
      * 主键
      */
-    private Long id;
+    private String id;
     /**
      * 上级ID
      */
@@ -21,15 +21,15 @@ public class LoudongTreeNode<T> implements Serializable {
     private List<T> children = new ArrayList<>();
 
 
-    public Long getId() {
+
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 
-
     public String getPid() {
         return pid;
     }
diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java
index e38b852cc8..37f3799090 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java
@@ -11,18 +11,8 @@ public class LouDongCascadeResultDTO extends LoudongTreeNode implements Serializ
 
     private static final long serialVersionUID = -359443782589013555L;
 
-    private String gridId;
+    private String label;
 
-    private String gridName;
-
-    private String communityId;
-
-    private String communityName;
-
-    private String streetId;
-
-    private String streetName;
-
-    private String pid;
+    private String value;
 
 }
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
index a6f1765830..57f4c256c0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
@@ -117,15 +117,12 @@
     </select>
     <select id="getLouDongCascade" resultType="com.epmet.opendata.dto.result.LouDongCascadeResultDTO">
         SELECT
-            GRID_ID,
-            GRID_NAME,
-            community_id,
-            community_name,
-            street_id,
-            street_name,
-            grid_id_path AS pid
+            ca.grid_id as id,
+            ca.grid_id as value,
+            ca.grid_name as label,
+            ca.parent_id as pid
         FROM
-            view_grid_comm_street
+          ca_bm_grid ca
     </select>