From f9b841b419c0d57679e535604b87d8b263390535 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 13 Nov 2025 08:08:13 +0800
Subject: [PATCH] 修复无人机在线检查
---
ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 06ee04a..0450d6a 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
@@ -10,16 +10,15 @@
import com.ard.data.noflyzone.domain.Vertex;
import com.ard.data.noflyzone.service.IArdNoFlyZoneService;
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
+import com.ard.work.aspect.annotation.CheckControlRight;
import com.ard.work.aspect.annotation.CheckDroneStatus;
import com.ard.work.aspect.annotation.CheckNoFlyZone;
import com.ard.work.aspect.annotation.CheckTakeoffAltitude;
-import com.ard.work.aspect.annotation.CheckControlRight;
import com.ard.work.domain.cache.UavTelemetryDataCache;
import com.ard.work.domain.dto.telemetry.TelemetryData;
-import com.ard.work.domain.entity.ArdDroneInfo;
-import com.ard.work.service.IArdDroneInfoService;
-import com.ard.work.service.control.UavControlService;
import com.ard.work.domain.message.UavControlType;
+import com.ard.work.domain.receiver.BoxInfoReceiver;
+import com.ard.work.service.control.UavControlService;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -77,8 +76,8 @@
}
// 3️⃣ 检查在线状态
- Boolean online = redisCache.getCacheObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
- if (online == null || !online) {
+ 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