From e666b9fe000aa871ddb0fa8e9aea6afe3f8064c6 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 24 Oct 2025 18:00:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/bean/CommonGBChannel.java       |  3 ++-
 .../web/custom/service/CameraChannelService.java    |  6 +++---
 web/src/views/common/CommonChannelEdit.vue          | 13 +++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
index 6713d8796..14143e306 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
@@ -101,7 +101,8 @@ public class CommonGBChannel {
     @Schema(description = "国标-虚拟组织所属的业务分组ID")
     private String gbBusinessGroupId;
 
-    @Schema(description = "国标-摄像机结构类型,标识摄像机类型: 1-球机; 2-半球; 3-固定枪机; 4-遥控枪机;5-遥控半球;6-多目设备的全景/拼接通道;7-多目设备的分割通道; 99-移动设备（非标）")
+    @Schema(description = "国标-摄像机结构类型,标识摄像机类型: 1-球机; 2-半球; 3-固定枪机; 4-遥控枪机;5-遥控半球;6-多目设备的全景/拼接通道;" +
+            "7-多目设备的分割通道; 99-移动设备（非标）98-会议设备（非标）")
     private Integer gbPtzType;
 
     // 2016
diff --git a/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java b/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java
index 9885a271c..c293f7b87 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java
@@ -207,13 +207,13 @@ public class CameraChannelService implements CommandLineRunner {
             sendChannelMessage(resultListForAdd, ChannelEvent.ChannelEventMessageType.ADD);
         }
         if (!resultListForUpdate.isEmpty()) {
-            sendChannelMessage(resultListForAdd, ChannelEvent.ChannelEventMessageType.UPDATE);
+            sendChannelMessage(resultListForUpdate, ChannelEvent.ChannelEventMessageType.UPDATE);
         }
         if (!resultListForOnline.isEmpty()) {
-            sendChannelMessage(resultListForAdd, ChannelEvent.ChannelEventMessageType.ON);
+            sendChannelMessage(resultListForOnline, ChannelEvent.ChannelEventMessageType.ON);
         }
         if (!resultListForOffline.isEmpty()) {
-            sendChannelMessage(resultListForAdd, ChannelEvent.ChannelEventMessageType.OFF);
+            sendChannelMessage(resultListForOffline, ChannelEvent.ChannelEventMessageType.OFF);
         }
     }
 
diff --git a/web/src/views/common/CommonChannelEdit.vue b/web/src/views/common/CommonChannelEdit.vue
index d2e1a9687..330106565 100644
--- a/web/src/views/common/CommonChannelEdit.vue
+++ b/web/src/views/common/CommonChannelEdit.vue
@@ -56,7 +56,7 @@
           <el-input v-model="form.gbLatitude" placeholder="请输入纬度" />
         </el-form-item>
         <el-form-item label="摄像机类型">
-          <el-select v-model="form.gbPtzType" style="width: 100%" placeholder="请选择云台类型">
+          <el-select v-model="form.gbPtzType" style="width: 100%" placeholder="请选择摄像机类型">
             <el-option label="球机" :value="1" />
             <el-option label="半球" :value="2" />
             <el-option label="固定枪机" :value="3" />
@@ -65,6 +65,7 @@
             <el-option label="多目设备的全景/拼接通道" :value="6" />
             <el-option label="多目设备的分割通道" :value="7" />
             <el-option label="移动设备（非标）" :value="99" />
+            <el-option label="会议设备（非标）" :value="98" />
           </el-select>
         </el-form-item>
       </div>
@@ -151,14 +152,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="用途">
-          <el-select v-model="form.gbUseType" style="width: 100%" placeholder="请选择位置类型">
+          <el-select v-model="form.gbUseType" style="width: 100%" placeholder="请选择用途类型">
             <el-option label="治安" :value="1" />
             <el-option label="交通" :value="2" />
             <el-option label="重点" :value="3" />
           </el-select>
         </el-form-item>
         <el-form-item label="补光">
-          <el-select v-model="form.gbSupplyLightType" style="width: 100%" placeholder="请选择位置类型">
+          <el-select v-model="form.gbSupplyLightType" style="width: 100%" placeholder="请选择补光类型">
             <el-option label="无补光" :value="1" />
             <el-option label="红外补光" :value="2" />
             <el-option label="白光补光" :value="3" />
@@ -167,7 +168,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="监视方位">
-          <el-select v-model="form.gbDirectionType" style="width: 100%" placeholder="请选择位置类型">
+          <el-select v-model="form.gbDirectionType" style="width: 100%" placeholder="请选择监视方位">
             <el-option label="东(西向东)" :value="1" />
             <el-option label="西(东向西)" :value="2" />
             <el-option label="南(北向南)" :value="3" />
@@ -190,7 +191,7 @@
           <el-input v-model="form.gbResolution" placeholder="请输入分辨率" />
         </el-form-item>
         <el-form-item label="下载倍速">
-          <el-select v-model="form.gbDownloadSpeedArray" multiple style="width: 100%" placeholder="请选择位置类型">
+          <el-select v-model="form.gbDownloadSpeedArray" multiple style="width: 100%" placeholder="请选择下载倍速">
             <el-option label="1倍速" value="1" />
             <el-option label="2倍速" value="2" />
             <el-option label="4倍速" value="4" />
@@ -206,7 +207,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="时域编码能力">
-          <el-select v-model="form.gbSvcTimeSupportMode" style="width: 100%" placeholder="请选择空域编码能力">
+          <el-select v-model="form.gbSvcTimeSupportMode" style="width: 100%" placeholder="请选择时域编码能力">
             <el-option label="1级增强" value="1" />
             <el-option label="2级增强" value="2" />
             <el-option label="3级增强" value="3" />