From f853f63ceed52c27206a62dd8ddef0af38d1e47c Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 28 Oct 2025 13:08:47 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 1e74284..8f389ee 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
@@ -7,30 +7,30 @@
import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
import com.ard.work.service.control.UavControlService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-
+@Slf4j
@Component
-public class UavAllManager extends BaseSubscriptionManager<Map<String,Object>> {
+public class UavAllManager extends BaseSubscriptionManager<Map<String, Object>> {
@Resource
private UavControlService uavControlService;
+
@Override
- protected Map<String,Object> getData(String boxSn) {
- Map<String,Object> map=new HashMap<>();
- UavState uavState = UavStateCache.getUavState(boxSn);
- if (uavState != null) {
- uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
- }
- map.put("boxSn", uavState.getBoxSn());
+ protected Map<String, Object> getData(String boxSn) {
+ log.debug("获取无人机所有数据");
+ Map<String, Object> map = new HashMap<>();
+ map.put("boxSn", boxSn);
+ UavState uavState = UavStateCache.get(boxSn);
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