From 8773c724919714845d4426a54d7b5aab8a9c0cae Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 20 Mar 2025 16:31:26 +0800
Subject: [PATCH] 优化结构
---
ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavAllManager.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavAllManager.java b/ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavAllManager.java
similarity index 89%
rename from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavAllManager.java
rename to ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavAllManager.java
index b3329f7..2dedcd8 100644
--- a/ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavAllManager.java
+++ b/ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavAllManager.java
@@ -1,14 +1,12 @@
-package com.ard.tianyu.websocket.handler;
+package com.ard.tianyu.component.websocket.handler;
import com.ard.tianyu.domain.cache.UavSignalInfoCache;
import com.ard.tianyu.domain.cache.UavStateCache;
import com.ard.tianyu.domain.cache.UavTelemetryDataCache;
import com.ard.tianyu.domain.dto.signal.SignalInfo;
-import com.ard.tianyu.domain.dto.state.CameraState;
import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.service.control.UavControlService;
-import com.ard.tianyu.util.CameraUtil;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -25,7 +23,9 @@
protected Map<String,Object> getData(String boxSn) {
Map<String,Object> map=new HashMap<>();
UavState uavState = UavStateCache.getUavState(boxSn);
- uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
+ if (uavState != null) {
+ uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
+ }
map.put("state", uavState);
TelemetryData uavTelemetryData = UavTelemetryDataCache.getUavTelemetryData(boxSn);
map.put("telemetry", uavTelemetryData);
--
Gitblit v1.9.3