From f78657473e85487c09cd3c10112db48a0c4a7c4e Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期一, 06 十一月 2023 20:34:58 +0800
Subject: [PATCH] fix(报警推送): 修复报警推送功能无效的问题
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 39f6388..ddf677c 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -133,17 +133,29 @@
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", "");
result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
- result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ if(inviteInfo.getStreamInfo().getHttps_flv() != null) {
+ result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ }
result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
- result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ if(inviteInfo.getStreamInfo().getWss_flv() != null) {
+ result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ }
result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
- result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ if (inviteInfo.getStreamInfo().getRtmps() != null) {
+ result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ }
result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
- result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ if (inviteInfo.getStreamInfo().getHttps_hls() != null) {
+ result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ }
result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
- result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ if (inviteInfo.getStreamInfo().getRtsps() != null) {
+ result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ }
result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
- result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ if (inviteInfo.getStreamInfo().getRtcs() != null) {
+ result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ }
result.put("CDN", "");
result.put("SnapURL", "");
result.put("Transport", device.getTransport());
--
Gitblit v1.8.0