From 41616f726dafafe7c015bf4f3e02a7aa9488a3a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 7 Mar 2022 10:47:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E6=97=B6=E6=97=A0=E5=B9=B3=E5=8F=B0=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transmit/cmd/impl/SIPCommanderFroPlatform.java  |  3 +++
 .../iot/vmp/service/impl/StreamPushServiceImpl.java | 13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index b55b0448..67cb734f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -563,6 +563,9 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
 
     @Override
     public void streamByeCmd(ParentPlatform platform, String callId) {
+        if (platform == null) {
+            return;
+        }
         SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platform.getServerGBId(), null, null, callId);
         if (sendRtpItem != null) {
             String mediaServerId = sendRtpItem.getMediaServerId();
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
index a13dc29d..39d37c5d 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
@@ -413,12 +413,15 @@ public class StreamPushServiceImpl implements IStreamPushService {
 
                 }
             }
-            platformGbStreamMapper.batchAdd(streamPushItemListFroPlatform);
-            // 发送通知
-            for (String platformId : platformForEvent.keySet()) {
-                eventPublisher.catalogEventPublishForStream(
-                        platformId, platformForEvent.get(platformId), CatalogEvent.ADD);
+            if (streamPushItemListFroPlatform.size() > 0) {
+                platformGbStreamMapper.batchAdd(streamPushItemListFroPlatform);
+                // 发送通知
+                for (String platformId : platformForEvent.keySet()) {
+                    eventPublisher.catalogEventPublishForStream(
+                            platformId, platformForEvent.get(platformId), CatalogEvent.ADD);
+                }
             }
+
         }
     }