From 7994c9f7e038af30dcce50ea284e80ba644a5a06 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 28 Nov 2025 19:29:52 +0800
Subject: [PATCH] 2025-11-28 zwy 调整代码，支持机场3飞行器视频
---
ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java | 27 +++++++++++++++++++--------
1 files changed, 19 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 6468eaf..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());
- String jsonString = 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) {
@@ -78,10 +75,12 @@
// rlive.setType(MessageType.LIVESTREAM.getType());
// resultLive = _objectMapper.writeValueAsString(rlive);
RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
+ log.info("SN: {}-停止直播，并删除redis直播信息！", sn);
} catch (Exception e) {
+ log.info("SN: {}-停止直播时发生异常，原因：{}", sn,e.getMessage());
e.printStackTrace();
}
- //_dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
+ // 停止直播不返回数据，直接删除redis中的直播地址标记即可；并且方法在websocket连接断开后执行。
}
public String getResult(String sn, String msg) {
@@ -126,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