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 @@
-
+
@@ -65,6 +65,7 @@
+
@@ -151,14 +152,14 @@
-
+
-
+
@@ -167,7 +168,7 @@
-
+
@@ -190,7 +191,7 @@
-
+
@@ -206,7 +207,7 @@
-
+