From 226b062ef301b61260efac126e1db373ace85b87 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 16 Jan 2026 09:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
index 7064f3f..2b85811 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
@@ -340,15 +340,15 @@
ArdDroneInfo local = localMap.get(boxSn);
boolean dbOnline = local != null && local.getOnLine() == 1;
boolean needUpdate = (dbOnline != currentOnline);
-
+ // 只要远端设备在线，就刷新Redis缓存（无论状态是否变化），保证缓存一定存在
+ if (currentOnline) {
+ redisCache.setCacheObject(redisKey, remote);
+ } else {
+ // 远端离线，删除Redis缓存
+ redisCache.deleteObject(redisKey);
+ }
// 如果状态变化才更新
if (needUpdate){
- // 更新 Redis
- if (currentOnline) {
- redisCache.setCacheObject(redisKey, remote);
- } else {
- redisCache.deleteObject(redisKey);
- }
// 发布事件
eventPublisher.publishEvent(new DeviceStatusEvent(boxSn, currentOnline));
// 更新数据库
--
Gitblit v1.9.3