From aca8842a1830d10c51f4ed98b23e77f9f0addbc5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 29 Nov 2025 11:30:02 +0800
Subject: [PATCH] 2025-11-29 zwy 处理OSD消息空指针异常
---
ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
index e939929..3456139 100644
--- a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
+++ b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
@@ -55,15 +55,12 @@
RedisOpsUtils.set(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn, resultLive);
}
}
+ _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
+ log.info("SN: {}-直播地址：{}", sn, resultLive);
} catch (Exception e) {
log.info("SN: {}-开启直播失败！原因：{}", sn, e.getMessage());
- resultLive = getResult(sn, "开启直播失败！原因：" + e.getMessage());
-// _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), jsonString);
e.printStackTrace();
}
-
- _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
- log.info("SN: {}-直播地址：{}", sn, resultLive);
}
public void StopLiveStreaming(String sn) {
@@ -84,7 +81,6 @@
e.printStackTrace();
}
// 停止直播不返回数据，直接删除redis中的直播地址标记即可；并且方法在websocket连接断开后执行。
- //_dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
}
public String getResult(String sn, String msg) {
@@ -129,9 +125,21 @@
}
List<CapacityCameraDTO> camerasList = device.getCamerasList();
for (CapacityCameraDTO camera : camerasList) {
- if (camera.getName() == null || camera.getName().isEmpty()) {
- continue;
+ // 机场3中飞行器，没有name，需要其他条件确定主摄像头参数
+ for(CapacityVideoDTO video : camera.getVideosList())
+ {
+ if(video.getSwitchVideoTypes().size() == 1 && camera.getName() == null)
+ {
+ continue;
+ }
}
+// camera.getVideosList().get(0).getSwitchVideoTypes().add("main");
+// if(camera.getVideosList().size() == 1 && camera.getName() == null) {
+// continue;
+// }
+// if (camera.getName() == null || camera.getName().isEmpty()) {
+// continue;
+// }
String videoid = device.getSn() + "/" + camera.getIndex();
List<CapacityVideoDTO> videosList = camera.getVideosList();
for (CapacityVideoDTO video : videosList) {
--
Gitblit v1.9.3