From 1e8e3d729f30a35287a818dfb34f1b720dfe1a80 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 7 Nov 2024 16:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E6=A0=87=E9=80=9A=E9=81=93=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E7=8E=B0=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E5=92=8C=E8=99=9A?=
 =?UTF-8?q?=E6=8B=9F=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GbChannelServiceImpl.java    |   2 +-
 .../components/common/CommonChannelEdit.vue   |  33 ++++-
 web_src/src/components/common/GroupTree.vue   | 119 ++++++++---------
 web_src/src/components/common/RegionTree.vue  | 125 ++++++++----------
 .../src/components/dialog/chooseCivilCode.vue |  65 +++++++++
 web_src/src/components/dialog/chooseGroup.vue |  70 ++++++++++
 web_src/src/components/group.vue              |   4 +-
 web_src/src/components/region.vue             |   2 +-
 8 files changed, 283 insertions(+), 137 deletions(-)
 create mode 100644 web_src/src/components/dialog/chooseCivilCode.vue
 create mode 100644 web_src/src/components/dialog/chooseGroup.vue

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
index 6eddaf06..38e3bd12 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
@@ -156,7 +156,7 @@ public class GbChannelServiceImpl implements IGbChannelService {
         }
         List<CommonGBChannel> onlineChannelList = commonGBChannelMapper.queryInListByStatus(commonGBChannelList, "ON");
         if (onlineChannelList.isEmpty()) {
-            log.warn("[多个通道离线] 更新失败, 参数内通道已经离线, 无需更新");
+            log.info("[多个通道离线] 更新失败, 参数内通道已经离线, 无需更新");
             return 0;
         }
         int limitCount = 1000;
diff --git a/web_src/src/components/common/CommonChannelEdit.vue b/web_src/src/components/common/CommonChannelEdit.vue
index 0f8baed2..79c3b8a3 100644
--- a/web_src/src/components/common/CommonChannelEdit.vue
+++ b/web_src/src/components/common/CommonChannelEdit.vue
@@ -7,7 +7,9 @@
         </el-form-item>
         <el-form-item label="编码" >
           <el-input v-model="form.gbDeviceId" placeholder="请输入通道编码">
-            <el-button slot="append" @click="buildDeviceIdCode(form.gbDeviceId)">生成</el-button>
+            <template v-slot:append>
+              <el-button  @click="buildDeviceIdCode(form.gbDeviceId)">生成</el-button>
+            </template>
           </el-input>
         </el-form-item>
         <el-form-item label="设备厂商" >
@@ -18,7 +20,11 @@
         </el-form-item>
 
         <el-form-item label="行政区域" >
-          <el-input v-model="form.gbCivilCode" placeholder="请输入行政区域"></el-input>
+          <el-input v-model="form.gbCivilCode" placeholder="请输入行政区域">
+            <template v-slot:append>
+              <el-button  @click="chooseCivilCode()">选择</el-button>
+            </template>
+          </el-input>
         </el-form-item>
 
         <el-form-item label="安装地址" >
@@ -31,7 +37,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="父节点编码" >
-          <el-input v-model="form.gbParentId" placeholder="请输入父节点编码"></el-input>
+          <el-input v-model="form.gbParentId" placeholder="请输入父节点编码">
+            <template v-slot:append>
+              <el-button  @click="chooseGroup()">选择</el-button>
+            </template>
+          </el-input>
         </el-form-item>
         <el-form-item label="设备状态" >
           <el-select v-model="form.gbStatus" style="width: 100%" placeholder="请选择设备状态">
@@ -202,16 +212,22 @@
 
     </el-form>
     <channelCode ref="channelCode"></channelCode>
+    <chooseCivilCode ref="chooseCivilCode"></chooseCivilCode>
+    <chooseGroup ref="chooseGroup"></chooseGroup>
   </div>
 </template>
 
 <script>
 import channelCode from './../dialog/channelCode'
+import ChooseCivilCode from "../dialog/chooseCivilCode.vue";
+import ChooseGroup from "../dialog/chooseGroup.vue";
 
 export default {
   name: "CommonChannelEdit",
   props: [ 'id', 'dataForm', 'saveSuccess', 'cancel'],
   components: {
+    ChooseCivilCode,
+    ChooseGroup,
     channelCode,
   },
   created() {
@@ -360,6 +376,17 @@ export default {
         console.log("code22===> " + code)
       }, deviceId);
     },
+    chooseCivilCode: function (){
+      this.$refs.chooseCivilCode.openDialog(code=>{
+          this.form.gbCivilCode = code;
+      });
+    },
+    chooseGroup: function (){
+      this.$refs.chooseGroup.openDialog((deviceId, businessGroupId)=>{
+          this.form.gbBusinessGroupId = businessGroupId;
+          this.form.gbParentId = deviceId;
+      });
+    },
     cancelSubmit: function (){
       if(this.cancel) {
         this.cancel()
diff --git a/web_src/src/components/common/GroupTree.vue b/web_src/src/components/common/GroupTree.vue
index a5c77a48..e09362b2 100755
--- a/web_src/src/components/common/GroupTree.vue
+++ b/web_src/src/components/common/GroupTree.vue
@@ -18,7 +18,7 @@
         class="flow-tree"
         ref="veTree"
         node-key="treeId"
-        height="78vh"
+        :height="treeHeight?treeHeight:'78vh'"
         lazy
         style="padding: 0 0 2rem 0.5rem"
         :load="loadNode"
@@ -70,7 +70,7 @@ export default {
       treeData: [],
     }
   },
-  props: ['edit', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup'],
+  props: ['edit','enableAddChannel', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'],
   created() {
   },
   methods: {
@@ -117,49 +117,52 @@ export default {
         return;
       }
       if (node.data.type === 0) {
-        this.$contextmenu({
-          items: [
-            {
-              label: "刷新节点",
-              icon: "el-icon-refresh",
-              disabled: false,
-              onClick: () => {
-                this.refreshNode(node);
-              }
-            },
-            {
-              label: "新建节点",
-              icon: "el-icon-plus",
-              disabled: false,
-              onClick: () => {
-                this.addGroup(data.id, node);
-              }
-            },
-            {
-              label: "编辑节点",
-              icon: "el-icon-edit",
-              disabled: node.level === 1,
-              onClick: () => {
-                this.editGroup(data, node);
-              }
-            },
-            {
-              label: "删除节点",
-              icon: "el-icon-delete",
-              disabled: node.level === 1,
-              divided: true,
-              onClick: () => {
-                this.$confirm('确定删除?', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                }).then(() => {
-                  this.removeGroup(data.id, node)
-                }).catch(() => {
+        let menuItem = [
+          {
+            label: "刷新节点",
+            icon: "el-icon-refresh",
+            disabled: false,
+            onClick: () => {
+              this.refreshNode(node);
+            }
+          },
+          {
+            label: "新建节点",
+            icon: "el-icon-plus",
+            disabled: false,
+            onClick: () => {
+              this.addGroup(data.id, node);
+            }
+          },
+          {
+            label: "编辑节点",
+            icon: "el-icon-edit",
+            disabled: node.level === 1,
+            onClick: () => {
+              this.editGroup(data, node);
+            }
+          },
+          {
+            label: "删除节点",
+            icon: "el-icon-delete",
+            disabled: node.level === 1,
+            divided: true,
+            onClick: () => {
+              this.$confirm('确定删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.removeGroup(data.id, node)
+              }).catch(() => {
 
-                });
-              }
-            },
+              });
+            }
+          },
+        ]
+
+        if (this.enableAddChannel) {
+          menuItem.push(
             {
               label: "添加设备",
               icon: "el-icon-plus",
@@ -168,6 +171,8 @@ export default {
                 this.addChannelFormDevice(data.id, node)
               }
             },
+          )
+          menuItem.push(
             {
               label: "移除设备",
               icon: "el-icon-delete",
@@ -177,6 +182,8 @@ export default {
                 this.removeChannelFormDevice(data.id, node)
               }
             },
+          )
+          menuItem.push(
             {
               label: "添加通道",
               icon: "el-icon-plus",
@@ -185,27 +192,11 @@ export default {
                 this.addChannel(data.id, node)
               }
             },
-            // {
-            //   label: "导出",
-            //   icon: "el-icon-download",
-            //   disabled: false,
-            //   children: [
-            //     {
-            //       label: "导出到文件",
-            //       onClick: () => {
-            //
-            //       },
-            //     },
-            //     {
-            //       label: "导出到其他平台",
-            //       onClick: () => {
-            //
-            //       },
-            //     }
-            //   ]
-            // },
+          )
+        }
 
-          ],
+        this.$contextmenu({
+          items: menuItem,
           event, // 鼠标事件信息
           customClass: "custom-class", // 自定义菜单 class
           zIndex: 3000, // 菜单样式 z-index
diff --git a/web_src/src/components/common/RegionTree.vue b/web_src/src/components/common/RegionTree.vue
index a9467100..e831b9df 100755
--- a/web_src/src/components/common/RegionTree.vue
+++ b/web_src/src/components/common/RegionTree.vue
@@ -17,7 +17,7 @@
         class="flow-tree"
         ref="veTree"
         node-key="treeId"
-        height="78vh"
+        :height="treeHeight?treeHeight:'78vh'"
         lazy
         style="padding: 0 0 2rem 0.5rem"
         :load="loadNode"
@@ -68,7 +68,7 @@ export default {
       treeData: [],
     }
   },
-  props: ['edit', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode'],
+  props: ['edit', 'enableAddChannel', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'],
   created() {
   },
   methods: {
@@ -118,49 +118,51 @@ export default {
       }
       console.log(node.level)
       if (node.data.type === 0) {
-        this.$contextmenu({
-          items: [
-            {
-              label: "刷新节点",
-              icon: "el-icon-refresh",
-              disabled: false,
-              onClick: () => {
-                this.refreshNode(node);
-              }
-            },
-            {
-              label: "新建节点",
-              icon: "el-icon-plus",
-              disabled: false,
-              onClick: () => {
-                this.addRegion(data.id, node);
-              }
-            },
-            {
-              label: "编辑节点",
-              icon: "el-icon-edit",
-              disabled: node.level === 1,
-              onClick: () => {
-                this.editCatalog(data, node);
-              }
-            },
-            {
-              label: "删除节点",
-              icon: "el-icon-delete",
-              disabled: node.level === 1,
-              divided: true,
-              onClick: () => {
-                this.$confirm('确定删除?', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                }).then(() => {
-                  this.removeRegion(data.id, node)
-                }).catch(() => {
+        let menuItem = [
+          {
+            label: "刷新节点",
+            icon: "el-icon-refresh",
+            disabled: false,
+            onClick: () => {
+              this.refreshNode(node);
+            }
+          },
+          {
+            label: "新建节点",
+            icon: "el-icon-plus",
+            disabled: false,
+            onClick: () => {
+              this.addRegion(data.id, node);
+            }
+          },
+          {
+            label: "编辑节点",
+            icon: "el-icon-edit",
+            disabled: node.level === 1,
+            onClick: () => {
+              this.editCatalog(data, node);
+            }
+          },
+          {
+            label: "删除节点",
+            icon: "el-icon-delete",
+            disabled: node.level === 1,
+            divided: true,
+            onClick: () => {
+              this.$confirm('确定删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.removeRegion(data.id, node)
+              }).catch(() => {
 
-                });
-              }
-            },
+              });
+            }
+          },
+        ]
+        if (this.enableAddChannel) {
+          menuItem.push(
             {
               label: "添加设备",
               icon: "el-icon-plus",
@@ -168,7 +170,9 @@ export default {
               onClick: () => {
                 this.addChannelFormDevice(data.id, node)
               }
-            },
+            }
+          )
+          menuItem.push(
             {
               label: "移除设备",
               icon: "el-icon-delete",
@@ -177,7 +181,9 @@ export default {
               onClick: () => {
                 this.removeChannelFormDevice(data.id, node)
               }
-            },
+            }
+          )
+          menuItem.push(
             {
               label: "添加通道",
               icon: "el-icon-plus",
@@ -185,28 +191,13 @@ export default {
               onClick: () => {
                 this.addChannel(data.id, node)
               }
-            },
-            // {
-            //   label: "导出",
-            //   icon: "el-icon-download",
-            //   disabled: false,
-            //   children: [
-            //     {
-            //       label: "导出到文件",
-            //       onClick: () => {
-            //
-            //       },
-            //     },
-            //     {
-            //       label: "导出到其他平台",
-            //       onClick: () => {
-            //
-            //       },
-            //     }
-            //   ]
-            // },
+            }
+          )
+        }
 
-          ],
+
+        this.$contextmenu({
+          items: menuItem,
           event, // 鼠标事件信息
           customClass: "custom-class", // 自定义菜单 class
           zIndex: 3000, // 菜单样式 z-index
diff --git a/web_src/src/components/dialog/chooseCivilCode.vue b/web_src/src/components/dialog/chooseCivilCode.vue
new file mode 100644
index 00000000..19c8f35a
--- /dev/null
+++ b/web_src/src/components/dialog/chooseCivilCode.vue
@@ -0,0 +1,65 @@
+<template>
+  <div id="chooseCivilCode" >
+    <el-dialog
+      title="选择行政区划"
+      width="30%"
+      top="5rem"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :destroy-on-close="true"
+      @close="close()"
+    >
+      <RegionTree ref="regionTree" :showHeader=true :edit="true" :enableAddChannel="false"  :clickEvent="treeNodeClickEvent"
+                  :onChannelChange="onChannelChange" :treeHeight="'45vh'"></RegionTree>
+      <el-form>
+        <el-form-item>
+          <div style="text-align: right">
+            <el-button type="primary" @click="onSubmit">保存</el-button>
+            <el-button @click="close">取消</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import RegionTree from "../common/RegionTree.vue";
+
+export default {
+  name: "chooseCivilCode",
+  components: {RegionTree},
+  props: {},
+  computed: {},
+  created() {},
+  data() {
+    return {
+      showDialog: false,
+      endCallback: false,
+      regionDeviceId: "",
+    };
+  },
+  methods: {
+    openDialog: function (callback) {
+      this.showDialog = true;
+      this.endCallback = callback;
+    },
+    onSubmit: function () {
+      if (this.endCallback) {
+        this.endCallback(this.regionDeviceId)
+      }
+      this.close();
+    },
+    close: function () {
+      this.showDialog = false;
+    },
+    treeNodeClickEvent: function (region) {
+      this.regionDeviceId = region.deviceId;
+    },
+    onChannelChange: function (deviceId) {
+      //
+    },
+  },
+};
+</script>
diff --git a/web_src/src/components/dialog/chooseGroup.vue b/web_src/src/components/dialog/chooseGroup.vue
new file mode 100644
index 00000000..4a327fdc
--- /dev/null
+++ b/web_src/src/components/dialog/chooseGroup.vue
@@ -0,0 +1,70 @@
+<template>
+  <div id="chooseGroup" >
+    <el-dialog
+      title="选择虚拟组织"
+      width="30%"
+      top="5rem"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :destroy-on-close="true"
+      @close="close()"
+    >
+      <GroupTree ref="regionTree" :showHeader=true :edit="true" :enableAddChannel="false"  :clickEvent="treeNodeClickEvent"
+                  :onChannelChange="onChannelChange" :treeHeight="'45vh'"></GroupTree>
+      <el-form>
+        <el-form-item>
+          <div style="text-align: right">
+            <el-button type="primary" @click="onSubmit">保存</el-button>
+            <el-button @click="close">取消</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import GroupTree from "../common/GroupTree.vue";
+
+export default {
+  name: "chooseCivilCode",
+  components: {GroupTree},
+  props: {},
+  computed: {},
+  created() {},
+  data() {
+    return {
+      showDialog: false,
+      endCallback: false,
+      groupDeviceId: "",
+      businessGroup: "",
+    };
+  },
+  methods: {
+    openDialog: function (callback) {
+      this.showDialog = true;
+      this.endCallback = callback;
+    },
+    onSubmit: function () {
+      if (this.endCallback) {
+        this.endCallback(this.groupDeviceId, this.businessGroup)
+      }
+      this.close();
+    },
+    close: function () {
+      this.showDialog = false;
+    },
+    treeNodeClickEvent: function (group) {
+      if (group.deviceId === "" || group.deviceId === group.businessGroup) {
+        return
+      }
+      this.groupDeviceId = group.deviceId;
+      this.businessGroup = group.businessGroup;
+    },
+    onChannelChange: function (deviceId) {
+      //
+    },
+  },
+};
+</script>
diff --git a/web_src/src/components/group.vue b/web_src/src/components/group.vue
index 7faf082f..17f6f60a 100755
--- a/web_src/src/components/group.vue
+++ b/web_src/src/components/group.vue
@@ -3,7 +3,7 @@
     <el-container v-loading="loading">
       <el-aside width="400px">
         <GroupTree ref="groupTree" :show-header="true" :edit="true" :clickEvent="treeNodeClickEvent"
-                   :onChannelChange="onChannelChange" :addChannelToGroup="addChannelToGroup"></GroupTree>
+                   :onChannelChange="onChannelChange" :enableAddChannel="true" :addChannelToGroup="addChannelToGroup"></GroupTree>
       </el-aside>
       <el-main style="padding: 5px;">
         <div class="page-header">
@@ -95,10 +95,12 @@ import uiHeader from '../layout/UiHeader.vue'
 import DeviceService from "./service/DeviceService";
 import GroupTree from "./common/GroupTree.vue";
 import GbChannelSelect from "./dialog/GbChannelSelect.vue";
+import RegionTree from "./common/RegionTree.vue";
 
 export default {
   name: 'channelList',
   components: {
+    RegionTree,
     GbChannelSelect,
     uiHeader,
     GroupTree,
diff --git a/web_src/src/components/region.vue b/web_src/src/components/region.vue
index 4c2b9ede..046fdce8 100755
--- a/web_src/src/components/region.vue
+++ b/web_src/src/components/region.vue
@@ -3,7 +3,7 @@
     <el-container v-loading="loading">
       <el-aside width="400px">
         <RegionTree ref="regionTree" :showHeader=true :edit="true" :clickEvent="treeNodeClickEvent"
-                    :onChannelChange="onChannelChange" :addChannelToCivilCode="addChannelToCivilCode"></RegionTree>
+                    :onChannelChange="onChannelChange" :enableAddChannel="true" :addChannelToCivilCode="addChannelToCivilCode"></RegionTree>
       </el-aside>
       <el-main style="padding: 5px;">
         <div class="page-header">