Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-24 63e503016c78aac218a4c7f9a765bcbb0b1e398e

 ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java

@@ -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);
                }
            }