From ba8b1496ba9881719e522d0a60a8c86baa7be08b Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 20 Dec 2025 10:34:23 +0800
Subject: [PATCH] 优化飞行状态
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 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 d6fb8c5..b7ca8e4 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,7 +1,10 @@
package com.ard.work.service.impl;
import cn.hutool.core.util.SerializeUtil;
+import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
+import com.ard.work.domain.dto.UavFlightStateDTO;
+import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
import com.ard.work.domain.entity.ArdFlightTaskPart;
import com.ard.work.mapper.ArdFlightTaskPartMapper;
@@ -11,8 +14,6 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -30,7 +31,7 @@
/**
* 缓存：boxSn -> 当前分片数据
*/
- private final ConcurrentHashMap<String, List<TelemetryData>> cacheMap = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<String, List<UavFlightStateDTO>> cacheMap = new ConcurrentHashMap<>();
/**
* 分片保存阈值条数
@@ -44,11 +45,19 @@
@Scheduled(fixedRate = 1000)
public void readTelemetryTask() {
UavTelemetryDataCache.forEach((boxSn, telemetryData) -> {
- // 只记录相对高度大于1米的数据
- float relativeHeight = telemetryData.getUltrasonic(); // 或者 telemetryData.getRelativeHeight()，根据你的字段
- if (relativeHeight > 1) {
- addTelemetryData(telemetryData);
+
+ // 从状态缓存里取当前状态
+ UavState uavState = UavStateCache.get(boxSn);
+ if (uavState == null) {
+ return; // 状态不存在，不记录
}
+
+ UavFlightStateDTO dto = new UavFlightStateDTO(
+ uavState,
+ telemetryData
+ );
+
+ addTelemetryData(dto);
});
}
@@ -56,10 +65,10 @@
* 添加一条遥测数据到缓存
*/
@Override
- public void addTelemetryData(TelemetryData telemetryData) {
- String boxSn = telemetryData.getBoxSn();
- List<TelemetryData> list = cacheMap.computeIfAbsent(boxSn, k -> new ArrayList<>());
- list.add(telemetryData);
+ public void addTelemetryData(UavFlightStateDTO uavFlightStateDTO) {
+ String boxSn = uavFlightStateDTO.getTelemetryData().getBoxSn();
+ List<UavFlightStateDTO> list = cacheMap.computeIfAbsent(boxSn, k -> new ArrayList<>());
+ list.add(uavFlightStateDTO);
// 当缓存条数达到阈值 或 时间间隔超过 CHUNK_INTERVAL 时，分片保存
if (list.size() >= CHUNK_SIZE) {
@@ -72,7 +81,7 @@
*/
@Async
public void saveChunk(String boxSn) {
- List<TelemetryData> dataList = cacheMap.getOrDefault(boxSn, new ArrayList<>());
+ List<UavFlightStateDTO> dataList = cacheMap.getOrDefault(boxSn, new ArrayList<>());
if (dataList.isEmpty()) {
return;
}
@@ -104,7 +113,7 @@
*/
@Override
public void flushRemaining(String boxSn) {
- List<TelemetryData> dataList = cacheMap.getOrDefault(boxSn, new ArrayList<>());
+ List<UavFlightStateDTO> dataList = cacheMap.getOrDefault(boxSn, new ArrayList<>());
if (!dataList.isEmpty()) {
saveChunk(boxSn);
}
@@ -114,13 +123,13 @@
* 获取完整航线轨迹（合并所有分片）
*/
@Override
- public List<TelemetryData> getCompleteFlightData(ArdFlightTaskPart ardFlightTaskPart) {
- List<TelemetryData> allData = new ArrayList<>();
+ public List<UavFlightStateDTO> getCompleteFlightData(ArdFlightTaskPart ardFlightTaskPart) {
+ List<UavFlightStateDTO> allData = new ArrayList<>();
String boxSn = ardFlightTaskPart.getBoxSn();
List<ArdFlightTaskPart> parts = ardflightTaskPartMapper.selectByTaskStartTime(ardFlightTaskPart);
for (ArdFlightTaskPart part : parts) {
try {
- List<TelemetryData> partData = SerializeUtil.deserialize(part.getDataPart());
+ List<UavFlightStateDTO> partData = SerializeUtil.deserialize(part.getDataPart());
allData.addAll(partData);
} catch (Exception e) {
log.error("反序列化 boxSn={} 分片数据失败", boxSn, e);
--
Gitblit v1.9.3