From 2acf49278129e5870d8b775519a2bc1461294fb8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 11 Mar 2026 08:55:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 110 ++++++++++++++++++++++---------------------------------
1 files changed, 44 insertions(+), 66 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 560cc25..567281a 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
@@ -307,87 +307,65 @@
*/
@Scheduled(fixedRate = 5000)
public void syncBoxInfo() {
- ArdServerInfo ardServerInfo = new ArdServerInfo();
- ardServerInfo.setUseDataScope(false);
- List<ArdServerInfo> servers = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
+ log.debug("定时执行同步盒子属性任务");
+ try {
+ ArdServerInfo ardServerInfo = new ArdServerInfo();
+ ardServerInfo.setUseDataScope(false);
+ List<ArdServerInfo> servers = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
- for (ArdServerInfo server : servers) {
- ArdDroneInfo droneInfo = new ArdDroneInfo();
- droneInfo.setServerId(server.getId());
- droneInfo.setUseDataScope(false);
- List<ArdDroneInfo> localList = selectArdDroneList(droneInfo);
- Map<String, ArdDroneInfo> localMap = localList.stream().collect(Collectors.toMap(ArdDroneInfo::getBoxSn,
- d -> d));
- List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
- // server 没有返回设备列表 → 全部离线
- if (boxList == null || boxList.isEmpty()) {
- for (ArdDroneInfo local : localList) {
- if (local.getOnLine() != 0) { // 仅当状态变化才更新
- local.setOnLine(0);
- ArdDroneInfoMapper.updateArdDrone(local);
- eventPublisher.publishEvent(new DeviceStatusEvent(local.getBoxSn(), false));
- redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + local.getBoxSn());
+ for (ArdServerInfo server : servers) {
+ ArdDroneInfo droneInfo = new ArdDroneInfo();
+ droneInfo.setServerId(server.getId());
+ droneInfo.setUseDataScope(false);
+ List<ArdDroneInfo> localList = selectArdDroneList(droneInfo);
+ Map<String, ArdDroneInfo> localMap = localList.stream().collect(Collectors.toMap(ArdDroneInfo::getBoxSn,
+ d -> d));
+ List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
+ // server 没有返回设备列表 → 全部离线
+ if (boxList == null || boxList.isEmpty()) {
+ for (ArdDroneInfo local : localList) {
+ if (local.getOnLine() != 0) { // 仅当状态变化才更新
+ local.setOnLine(0);
+ ArdDroneInfoMapper.updateArdDrone(local);
+ eventPublisher.publishEvent(new DeviceStatusEvent(local.getBoxSn(), false));
+ redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + local.getBoxSn());
+ }
}
+ continue;
}
- continue;
- }
- // server 返回设备列表 → 通过缓存判断状态
- for (BoxInfoReceiver remote : boxList) {
- String boxSn = remote.getBoxSn();
- String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
- boolean currentOnline = remote.getOnLine() == 1;
+ // server 返回设备列表 → 通过缓存判断状态
+ for (BoxInfoReceiver remote : boxList) {
+ String boxSn = remote.getBoxSn();
+ String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
+ boolean currentOnline = remote.getOnLine() == 1;
- ArdDroneInfo local = localMap.get(boxSn);
- boolean dbOnline = local != null && local.getOnLine() == 1;
- boolean needUpdate = (dbOnline != currentOnline);
-
- // 如果状态变化才更新
- if (needUpdate){
- // 更新 Redis
+ 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);
}
- // 发布事件
- eventPublisher.publishEvent(new DeviceStatusEvent(boxSn, currentOnline));
- // 更新数据库
- if (local != null) {
- local.setOnLine(currentOnline ? 1 : 0);
- updateArdDrone(local);
+ // 如果状态变化才更新
+ if (needUpdate) {
+ // 发布事件
+ eventPublisher.publishEvent(new DeviceStatusEvent(boxSn, currentOnline));
+ // 更新数据库
+ if (local != null) {
+ local.setOnLine(currentOnline ? 1 : 0);
+ updateArdDrone(local);
+ }
}
}
}
+ } catch (Exception e) {
+ log.error("同步盒子属性任务异常", e);
}
}
- /**
- * 更新 localBoxInfo 的字段，如果有变化返回 true，否则返回 false
- */
- private boolean updateChangedAttributes(ArdDroneInfo localBoxInfo, BoxInfoReceiver remoteArdDrone) {
- boolean changed = false;
-
- if (!Objects.equals(localBoxInfo.getBoxName(), remoteArdDrone.getBoxName())) {
- localBoxInfo.setBoxName(remoteArdDrone.getBoxName());
- changed = true;
- }
- if (!Objects.equals(localBoxInfo.getBoxVersion(), remoteArdDrone.getBoxVersion())) {
- localBoxInfo.setBoxVersion(remoteArdDrone.getBoxVersion());
- changed = true;
- }
- if (!Objects.equals(localBoxInfo.getLastTaskId(), remoteArdDrone.getLastTaskId())) {
- localBoxInfo.setLastTaskId(remoteArdDrone.getLastTaskId());
- changed = true;
- }
- if (!Objects.equals(localBoxInfo.getOnLine(), remoteArdDrone.getOnLine())) {
- localBoxInfo.setOnLine(remoteArdDrone.getOnLine());
- changed = true;
- }
-
- // TODO: 更新其他属性时，如果变化也设置 changed = true
-
- return changed;
- }
}
--
Gitblit v1.9.3