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/UavStateCache.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/cache/UavStateCache.java b/ard-work/src/main/java/com/ard/work/domain/cache/UavStateCache.java
index ddd31c3..70349c4 100644
--- a/ard-work/src/main/java/com/ard/work/domain/cache/UavStateCache.java
+++ b/ard-work/src/main/java/com/ard/work/domain/cache/UavStateCache.java
@@ -1,6 +1,7 @@
package com.ard.work.domain.cache;
import com.ard.work.domain.dto.state.UavState;
+
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -12,20 +13,27 @@
public class UavStateCache {
// 使用 ConcurrentHashMap 来缓存无人机状态数据，key 是 boxSn（无人机序列号）
- private static final ConcurrentHashMap<String, UavState> uavStateCache = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap<String, UavState> cache = new ConcurrentHashMap<>();
// 存储无人机状态数据到缓存
- public static void putUavState(UavState uavState) {
- uavStateCache.put(uavState.getBoxSn(), uavState);
- }
+ public static void put(UavState uavState) {cache.put(uavState.getBoxSn(), uavState);}
// 从缓存中获取无人机状态数据
- public static UavState getUavState(String boxSn) {
- return uavStateCache.get(boxSn);
+ public static UavState get(String boxSn) {
+ return cache.get(boxSn);
}
// 删除缓存中的无人机状态数据
- public static void removeUavState(String boxSn) {
- uavStateCache.remove(boxSn);
+ public static void remove(String boxSn) {
+ cache.remove(boxSn);
+ }
+
+ // 定时任务使用：判断状态是否变化，但不更新缓存
+ public static boolean hasChanged(String boxSn, UavState newState) {
+ UavState oldState = cache.get(boxSn);
+ if (oldState == null) {
+ return true; // 没有缓存，算作变化
+ }
+ return !oldState.equals(newState); // true = 有变化
}
}
--
Gitblit v1.9.3