From b20738c3993b7b8f80c2dee6edf1b4faf7dbecb0 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 15 Oct 2025 17:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
index 6adfc48..f6ce332 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
@@ -23,6 +23,8 @@
@Resource
private UavControlService uavControlService;
@Resource
+ private UavStreamManager uavStreamManager;
+ @Resource
private UavStateManager uavStateManager;
@Resource
private UavTelemetryManager uavTelemetryManager;
@@ -45,7 +47,7 @@
MessageType messageType = MessageType.fromString(baseMessage.getType());
switch (messageType) {
case STREAM:
-
+ handleStreamMessage(payload, userId);
break;
case STATE:
handleStateMessage(payload, userId);
@@ -65,6 +67,34 @@
}
} catch (Exception e) {
log.error("Error handling message: {}", message, e);
+ }
+ }
+
+ /**
+ * 处理流消息
+ * <p>
+ * 该方法解析给定的负载数据，以获取无人机流消息，并根据消息类型决定是否开始或停止流
+ *
+ * @param payload 消息的负载数据，通常为JSON字符串
+ * @param userId 接收消息的用户ID
+ */
+ private void handleStreamMessage(String payload, Long userId) {
+ // 解析JSON负载数据为BaseMessage对象，包含UavStreamMessage类型的有效载荷
+ BaseMessage<UavStreamMessage> streamMessage = JSON.parseObject(payload,
+ new TypeReference<BaseMessage<UavStreamMessage>>() {
+ });
+ UavStreamMessage uavStreamMessage = streamMessage.getPayload();
+
+ // 检查解析后的UavStreamMessage对象是否非空
+ if (uavStreamMessage != null) {
+ String boxSn = uavStreamMessage.getBoxSn();
+
+ // 根据Subscribe决定操作类型：true表示开始拉流，false表示停止拉流
+ if (uavStreamMessage.getSubscribe()) {
+ uavStreamManager.subscribe(boxSn, userId);
+ } else {
+ uavStreamManager.unsubscribe(boxSn, userId);
+ }
}
}
@@ -233,11 +263,9 @@
WebSocketSessionManager.removeSession(userId);
log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
- if (userId != null) {
- // 释放该用户所有 UAV 控制权
- uavControlService.releaseAllControls(userId);
- }
-
+ // 释放该用户所有 UAV 控制权
+ uavControlService.releaseAllControls(userId);
+ uavStreamManager.stopAllPullStreamByUser(userId);
uavStateManager.removeSubscribe(userId);
uavTelemetryManager.removeSubscribe(userId);
uavSignalManager.removeSubscribe(userId);
--
Gitblit v1.9.3