From cd3ae80d367ffd48dad5f55f3e5961bf50095703 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 12 Dec 2025 10:23:50 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java b/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
index 5f1f2fb..98e44e8 100644
--- a/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
+++ b/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
@@ -87,7 +87,7 @@
* 高度检查
*/
@Before("@annotation(checkTakeoffAltitude)")
- public void takeoffAltitudeCheck(JoinPoint joinPoint, CheckTakeoffAltitude checkTakeoffAltitude) {
+ public void takeoffAltitudeCheck(JoinPoint joinPoint, CheckTakeoffAltitude checkTakeoffAltitude){
// 获取最小高度
double minAltitude = checkTakeoffAltitude.minAltitude();
// 获取方法参数
@@ -102,7 +102,7 @@
throw new ControlException("遥测数据异常，无法执行！");
}
// 检查高度
- if (uavTelemetryData.getAltitude() < minAltitude) {
+ if (uavTelemetryData.getUltrasonic() < minAltitude) {
throw new ControlException("高度太低，无法执行！最低高度: " + minAltitude);
}
}
@@ -125,8 +125,9 @@
}
// 检查在线状态
if (checkDroneStatus.checkOnline()) {
- Boolean online = redisCache.getCacheObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
- if (online == null || !online) {
+ // 3️⃣ 检查在线状态
+ BoxInfoReceiver obj = redisCache.getCacheObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ if (obj == null || !obj.getOnLine().equals(1)) {
throw new ControlException("无人机离线，无法执行操作！boxSn: " + boxSn);
}
}
--
Gitblit v1.9.3