From c3267403ba13f9cafc460688aea4ffb772f7d2a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 26 Sep 2024 15:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E7=BB=84=E6=A0=91?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E6=A0=91=E7=9A=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java    | 2 +-
 .../java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java   | 3 +++
 .../genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java  | 2 ++
 .../java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java   | 1 +
 .../java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java  | 1 +
 .../iot/vmp/gb28181/dao/provider/ChannelProvider.java         | 4 ++--
 web_src/src/components/common/GroupTree.vue                   | 3 ++-
 web_src/src/components/common/RegionTree.vue                  | 3 ++-
 web_src/src/components/group.vue                              | 4 ++--
 9 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java
index 5265ada6..8ac1278e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java
@@ -10,7 +10,7 @@ import lombok.Data;
 @Schema(description = "业务分组树")
 public class GroupTree extends Group{
 
-    @Schema(description = "是否有子节点")
+    @Schema(description = "树节点ID")
     private String treeId;
 
     @Schema(description = "是否有子节点")
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java
index 8e6929a1..b771a603 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java
@@ -10,6 +10,9 @@ import lombok.Data;
 @Schema(description = "区域树")
 public class RegionTree extends Region {
 
+    @Schema(description = "树节点ID")
+    private String treeId;
+
     @Schema(description = "是否有子节点")
     private boolean isLeaf;
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
index a6bd3a6c..172537c1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
@@ -263,6 +263,7 @@ public interface CommonGBChannelMapper {
     @Select("<script>" +
             " select " +
             "    id," +
+            "    concat('channel', id) as tree_id," +
             "    coalesce(gb_device_id, device_id) as device_id," +
             "    coalesce(gb_name, name) as name, " +
             "    coalesce(gb_parent_id, parent_id) as parent_device_id, " +
@@ -352,6 +353,7 @@ public interface CommonGBChannelMapper {
     @Select("<script>" +
             " select " +
             "    id," +
+            "    concat('channel', id) as tree_id," +
             "    coalesce(gb_device_id, device_id) as device_id," +
             "    coalesce(gb_name, name) as name, " +
             "    coalesce(gb_parent_id, parent_id) as parent_device_id, " +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java
index 0d8b9d85..5fb64468 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java
@@ -67,6 +67,7 @@ public interface GroupMapper {
     @Select(" <script>" +
             " SELECT " +
             " * , " +
+            " concat('group', id) as tree_id," +
             " 0 as type," +
             " false as is_leaf" +
             " from wvp_common_group " +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java
index 13cb73bb..42db7bbf 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java
@@ -72,6 +72,7 @@ public interface RegionMapper {
     @Select(" <script>" +
             " SELECT " +
             " *, " +
+            " concat('region', id) as tree_id," +
             " 0 as type," +
             " false as is_leaf" +
             " from wvp_common_region " +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
index 1a148cf3..79a8c6b6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
@@ -96,10 +96,10 @@ public class ChannelProvider {
             sqlBuild.append(" AND coalesce(gb_civil_code, civil_code) is null");
         }
         if (params.get("hasGroup") != null && (Boolean)params.get("hasGroup")) {
-            sqlBuild.append(" AND coalesce(gb_business_group_id, business_group_id) is not null");
+            sqlBuild.append(" AND coalesce(gb_parent_id, parent_id) is not null");
         }
         if (params.get("hasGroup") != null && !(Boolean)params.get("hasGroup")) {
-            sqlBuild.append(" AND coalesce(gb_business_group_id, business_group_id) is null");
+            sqlBuild.append(" AND coalesce(gb_parent_id, parent_id) is null");
         }
         return sqlBuild.toString();
     }
diff --git a/web_src/src/components/common/GroupTree.vue b/web_src/src/components/common/GroupTree.vue
index b7c08ebf..f4d6ac01 100755
--- a/web_src/src/components/common/GroupTree.vue
+++ b/web_src/src/components/common/GroupTree.vue
@@ -16,7 +16,7 @@
       <vue-easy-tree
         class="flow-tree"
         ref="veTree"
-        node-key="deviceId"
+        node-key="treeId"
         height="78vh"
         lazy
         style="padding: 0 0 2rem 0.5rem"
@@ -74,6 +74,7 @@ export default {
     loadNode: function (node, resolve) {
       if (node.level === 0) {
         resolve([{
+          treeId: "",
           deviceId: "",
           name: "根资源组",
           isLeaf: false,
diff --git a/web_src/src/components/common/RegionTree.vue b/web_src/src/components/common/RegionTree.vue
index a2e6c9de..2224db4b 100755
--- a/web_src/src/components/common/RegionTree.vue
+++ b/web_src/src/components/common/RegionTree.vue
@@ -16,7 +16,7 @@
       <vue-easy-tree
         class="flow-tree"
         ref="veTree"
-        node-key="deviceId"
+        node-key="treeId"
         height="78vh"
         lazy
         style="padding: 0 0 2rem 0.5rem"
@@ -74,6 +74,7 @@ export default {
     loadNode: function (node, resolve) {
       if (node.level === 0) {
         resolve([{
+          treeId: "",
           deviceId: "",
           name: "根资源组",
           isLeaf: false,
diff --git a/web_src/src/components/group.vue b/web_src/src/components/group.vue
index ec26bd71..cc17cb85 100755
--- a/web_src/src/components/group.vue
+++ b/web_src/src/components/group.vue
@@ -67,8 +67,8 @@
           <el-table-column label="添加状态" min-width="100">
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
-                <el-tag size="medium" :title="scope.row.gbBusinessGroupId" v-if="scope.row.gbBusinessGroupId">已添加</el-tag>
-                <el-tag size="medium" type="info" v-if="!scope.row.gbBusinessGroupId">未添加</el-tag>
+                <el-tag size="medium" :title="scope.row.gbParentId" v-if="scope.row.gbParentId">已添加</el-tag>
+                <el-tag size="medium" type="info" v-if="!scope.row.gbParentId">未添加</el-tag>
               </div>
             </template>
           </el-table-column>