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/UavAllManager.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
index 4711193..1e1e469 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
@@ -22,14 +22,15 @@
@Override
protected Map<String,Object> getData(String boxSn) {
Map<String,Object> map=new HashMap<>();
- UavState uavState = UavStateCache.getUavState(boxSn);
+ UavState uavState = UavStateCache.get(boxSn);
if (uavState != null) {
uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
}
+ map.put("boxSn", uavState.getBoxSn());
map.put("state", uavState);
- TelemetryData uavTelemetryData = UavTelemetryDataCache.getUavTelemetryData(boxSn);
+ TelemetryData uavTelemetryData = UavTelemetryDataCache.get(boxSn);
map.put("telemetry", uavTelemetryData);
- SignalInfo uavSignalInfo = UavSignalInfoCache.getUavSignalInfo(boxSn);
+ SignalInfo uavSignalInfo = UavSignalInfoCache.get(boxSn);
map.put("signal", uavSignalInfo);
// 获取当前控制飞行的用户ID
Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
--
Gitblit v1.9.3