From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java
index 0917724..da66e03 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java
@@ -1,6 +1,7 @@
package com.ard.work.service.impl;
import cn.hutool.core.util.SerializeUtil;
+import com.ard.common.utils.DateUtils;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
import com.ard.work.domain.dto.UavFlightStateDTO;
@@ -44,22 +45,22 @@
/**
* 定时任务：每秒读取一次设备状态数据
- * 注意：这里模拟读取状态，实际应该调用设备接口或缓存
*/
@Scheduled(fixedRate = 1000)
public void readTelemetryTask() {
long now = System.currentTimeMillis();
UavTelemetryDataCache.forEach((boxSn, telemetryData) -> {
-
// 1️⃣ 从状态缓存里取当前状态
UavState uavState = UavStateCache.get(boxSn);
if (uavState == null) {
+ log.warn("状态不存在，不记录");
return; // 状态不存在，不记录
}
// 2️⃣ 使用遥测自身时间戳判断是否还活着
long dataTs = telemetryData.getTimestamp(); // 设备时间 / 服务器接收时间
if (now - dataTs > 3000) {
+ log.warn("超过 3 秒没有新遥测 → 认为已离线或冻结，不记录：{}", new Date(dataTs));
return; // 超过 3 秒没有新遥测 → 认为已离线或冻结，不记录
}
@@ -71,18 +72,13 @@
flushRemaining(boxSn);
}
lastFlightStatusMap.put(boxSn, currentStatus);
-
+ log.debug("设备 {} 当前状态为：{}", boxSn, currentStatus);
// 只有飞行中才添加缓存
if (currentStatus == 2) {
+ log.warn("设备 {} 当前状态为飞行中，添加遥测数据到缓存", boxSn);
UavFlightStateDTO dto = new UavFlightStateDTO(uavState, telemetryData, dataTs);
addTelemetryData(dto);
}
- UavFlightStateDTO dto = new UavFlightStateDTO(
- uavState,
- telemetryData,
- dataTs
- );
- addTelemetryData(dto);
});
}
--
Gitblit v1.9.3