From fc365c426e431a73d116e5d51deaec667f4864de Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 20 Oct 2025 17:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/cache/UavTelemetryDataCache.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/cache/UavTelemetryDataCache.java b/ard-work/src/main/java/com/ard/work/domain/cache/UavTelemetryDataCache.java
index 65cb4ba..abb7da0 100644
--- a/ard-work/src/main/java/com/ard/work/domain/cache/UavTelemetryDataCache.java
+++ b/ard-work/src/main/java/com/ard/work/domain/cache/UavTelemetryDataCache.java
@@ -1,5 +1,6 @@
package com.ard.work.domain.cache;
+import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
import java.util.concurrent.ConcurrentHashMap;
@@ -13,20 +14,29 @@
public class UavTelemetryDataCache {
// 使用 ConcurrentHashMap 来缓存无人机遥测数据，key 是 boxSn（无人机序列号）
- private static final ConcurrentHashMap<String, TelemetryData> uavTelemetryDataCache = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap<String, TelemetryData> cache = new ConcurrentHashMap<>();
// 存储无人机遥测数据到缓存
- public static void putUavTelemetryData(TelemetryData telemetryData) {
- uavTelemetryDataCache.put(telemetryData.getBoxSn(), telemetryData);
+ public static void put(TelemetryData telemetryData) {
+ cache.put(telemetryData.getBoxSn(), telemetryData);
}
// 从缓存中获取无人机遥测数据
- public static TelemetryData getUavTelemetryData(String boxSn) {
- return uavTelemetryDataCache.get(boxSn);
+ public static TelemetryData get(String boxSn) {
+ return cache.get(boxSn);
}
// 删除缓存中的无人机遥测数据
- public static void removeUavTelemetryData(String boxSn) {
- uavTelemetryDataCache.remove(boxSn);
+ public static void remove(String boxSn) {
+ cache.remove(boxSn);
+ }
+
+ // 定时任务使用：判断状遥测数据是否变化，但不更新缓存
+ public static boolean hasChanged(String boxSn, TelemetryData telemetryData) {
+ TelemetryData oldTelemetryData= cache.get(boxSn);
+ if (oldTelemetryData == null) {
+ return true; // 没有缓存，算作变化
+ }
+ return !oldTelemetryData.equals(telemetryData); // true = 有变化
}
}
--
Gitblit v1.9.3