From 27428b31edee97703b529559146cdd7eef87a7a9 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 11:00:58 +0800
Subject: [PATCH] 完成测试数据接收持久化与查询
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataQueryServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataQueryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataQueryServiceImpl.java
index 06ee3c8..5d28386 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataQueryServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataQueryServiceImpl.java
@@ -37,7 +37,7 @@
{
requireTest(testId);
List<Map<String, Object>> source = new java.util.ArrayList<>();
- List<Map<String, Object>> snapshots = mapper.selectPersistedRealtimeSnapshots(testId);
+ List<Map<String, Object>> snapshots = mapper.selectPersistedFinalRealtimeRecords(testId);
if (snapshots != null && !snapshots.isEmpty()) source.addAll(snapshots);
else {
// 迁移完成前兼容旧数据；新采集只从统一快照读取。
@@ -48,19 +48,43 @@
}
List<Map<String, Object>> effective = applyEffectiveData(testId, "REALTIME", source);
attachCollectorStepContext(effective);
- return effective;
+ return normalizeApiTimes(effective);
}
@Override public List<Map<String, Object>> steps(Long testId)
{
requireTest(testId);
- return applyEffectiveData(testId, "STEP", mapper.selectPersistedSteps(testId));
+ List<Map<String, Object>> source = mapper.selectPersistedFinalStepRecords(testId);
+ if (source == null || source.isEmpty()) {
+ List<Map<String, Object>> legacy = mapper.selectPersistedSteps(testId);
+ if (legacy != null && !legacy.isEmpty()) source = legacy;
+ }
+ return normalizeApiTimes(applyEffectiveData(testId, "STEP", source));
}
@Override public List<Map<String, Object>> cycles(Long testId)
{
requireTest(testId);
- return applyEffectiveData(testId, "CYCLE", mapper.selectPersistedCycles(testId));
+ List<Map<String, Object>> source = mapper.selectPersistedFinalCycleRecords(testId);
+ if (source == null || source.isEmpty()) {
+ List<Map<String, Object>> legacy = mapper.selectPersistedCycles(testId);
+ if (legacy != null && !legacy.isEmpty()) source = legacy;
+ }
+ return normalizeApiTimes(applyEffectiveData(testId, "CYCLE", source));
+ }
+
+ /** 自研业务接口统一以 Unix epoch 毫秒返回时间，避免前端依赖数据库日期格式。 */
+ private List<Map<String, Object>> normalizeApiTimes(List<Map<String, Object>> rows)
+ {
+ if (rows == null) return List.of();
+ for (Map<String, Object> row : rows)
+ for (String key : List.of("deviceTime", "recordedAt", "absoluteTime", "serverReceivedAt"))
+ {
+ Object value = row.get(key);
+ if (value instanceof Date date) row.put(key, date.getTime());
+ else if (value instanceof Instant instant) row.put(key, instant.toEpochMilli());
+ }
+ return rows;
}
/** 将最新人工覆盖应用到设备事实，删除只影响当前有效视图，不抹除原始采样。 */
--
Gitblit v1.7.1