From af27ae0dfc0afb149596f9cc1f87d00fdb0cc179 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 24 Oct 2024 16:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8=E5=90=8E?=
 =?UTF-8?q?=E4=BB=8Eredis=E6=9F=A5=E8=AF=A2=E6=8E=A8=E6=B5=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/media/event/hook/HookSubscribe.java   |  1 -
 .../RedisPushStreamStatusMsgListener.java     | 22 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java b/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java
index b88fdd443..c26f3dca3 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java
@@ -82,7 +82,6 @@ public class HookSubscribe {
     }
 
     public void addSubscribe(Hook hook, HookSubscribe.Event event) {
-        System.out.println("add==" + hook.toString());
         if (hook.getExpireTime() == null) {
             hook.setExpireTime(System.currentTimeMillis() + subscribeExpire);
         }
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 2b11cbf38..bd1107e97 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
@@ -100,15 +100,21 @@ public class RedisPushStreamStatusMsgListener implements MessageListener, Applic
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        if (!userSetting.isUsePushingAsStatus()) {
-            //  启动时设置所有推流通道离线，发起查询请求
-            redisCatchStorage.sendStreamPushRequestedMsgForStatus();
-            dynamicTask.startDelay(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED, () -> {
-                log.info("[REDIS消息]未收到redis回复推流设备状态，执行推流设备离线");
-                // 五秒收不到请求就设置通道离线，然后通知上级离线
-                streamPushService.allOffline();
-            }, 5000);
+        if (userSetting.isUsePushingAsStatus()) {
+            return;
         }
+        // 查询是否存在推流设备,没有则不发送
+        List<String> allAppAndStream = streamPushService.getAllAppAndStream();
+        if (allAppAndStream == null || allAppAndStream.isEmpty()) {
+            return;
+        }
+        //  启动时设置所有推流通道离线，发起查询请求
+        redisCatchStorage.sendStreamPushRequestedMsgForStatus();
+        dynamicTask.startDelay(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED, () -> {
+            log.info("[REDIS消息]未收到redis回复推流设备状态，执行推流设备离线");
+            // 五秒收不到请求就设置通道离线，然后通知上级离线
+            streamPushService.allOffline();
+        }, 5000);
     }
 
 }