From fc365c426e431a73d116e5d51deaec667f4864de Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 20 Oct 2025 17:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java
index 863171a..4e56d46 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java
@@ -12,7 +12,7 @@
import java.util.Map;
@Service
-public class UavControlManager extends BaseSubscriptionManager<Map<String, Long>> {
+public class UavControlManager extends BaseSubscriptionManager<Map<String, Object>> {
@Resource
private UavControlService uavControlService;
@@ -60,13 +60,14 @@
* @return 返回一个映射，包含无人机（fly）和载荷（payload）的当前控制者用户ID
*/
@Override
- protected Map<String, Long> getData(String boxSn) {
+ protected Map<String, Object> getData(String boxSn) {
// 获取当前控制飞行的用户ID
Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
// 获取当前控制载荷的用户ID
Long payloadUserId = uavControlService.getCurrentController(boxSn, "payload");
// 创建一个映射，用于存储飞行和载荷的当前控制者用户ID
- Map<String, Long> map=new HashMap<>();
+ Map<String, Object> map=new HashMap<>();
+ map.put("boxSn", boxSn);
// 将飞行当前控制者用户ID添加到映射中
map.put("flyController", flyUserId);
// 将载荷当前控制者用户ID添加到映射中
--
Gitblit v1.9.3