From d925f9003dc5184b023001dfe329dd23f678e69e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 19 Sep 2024 15:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E6=A0=87=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java  | 4 ++--
 .../service/redisMsg/RedisPushStreamStatusMsgListener.java  | 2 ++
 web_src/src/components/PlatformList.vue                     | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

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 e0826601e..960d07956 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
@@ -155,7 +155,7 @@ public class GbChannelServiceImpl implements IGbChannelService {
         }
         List<CommonGBChannel> onlineChannelList = commonGBChannelMapper.queryInListByStatus(commonGBChannelList, "ON");
         if (onlineChannelList.isEmpty()) {
-            log.warn("[多个通道离线] 更新失败, 参数内通道已经离线");
+            log.warn("[多个通道离线] 更新失败, 参数内通道已经离线, 无需更新");
             return 0;
         }
         int limitCount = 1000;
@@ -209,7 +209,7 @@ public class GbChannelServiceImpl implements IGbChannelService {
         }
         List<CommonGBChannel> offlineChannelList = commonGBChannelMapper.queryInListByStatus(commonGBChannelList, "OFF");
         if (offlineChannelList.isEmpty()) {
-            log.warn("[多个通道上线] 更新失败, 参数内通道已经上线线");
+            log.warn("[多个通道上线] 更新失败, 参数内通道已经上线");
             return 0;
         }
         // 批量更新
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
index 9746d132e..428f743f7 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
@@ -23,6 +23,8 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 /**
  * 接收redis发送的推流设备上线下线通知
  * @author lin
+ * 发送 PUBLISH VM_MSG_PUSH_STREAM_STATUS_CHANGE '{"setAllOffline":false,"offlineStreams":[{"app":"1000","stream":"10000022","timeStamp":1726729716551}]}'
+ * 订阅 SUBSCRIBE VM_MSG_PUSH_STREAM_STATUS_CHANGE
  */
 @Slf4j
 @Component
diff --git a/web_src/src/components/PlatformList.vue b/web_src/src/components/PlatformList.vue
index ea46462ee..0a9ece33a 100755
--- a/web_src/src/components/PlatformList.vue
+++ b/web_src/src/components/PlatformList.vue
@@ -236,9 +236,9 @@ export default {
             characterSet: "GB2312",
             startOfflinePush: false,
             customGroup: false,
-            catalogWithPlatform: false,
-            catalogWithGroup: false,
-            catalogWithRegion: false,
+            catalogWithPlatform: 0,
+            catalogWithGroup: 0,
+            catalogWithRegion: 0,
             manufacturer: null,
             model: null,
             address: null,