Bladeren bron

修复导入通道时无平台关联时的bug

648540858 3 jaren geleden
bovenliggende
commit
41616f726d

+ 3 - 0
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();

+ 8 - 5
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);
+                }
             }
+
         }
     }