From 9c93934b70ccfca081102944a47f3baafad3c218 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 28 九月 2026 16:43:57 +0800
Subject: [PATCH] 实现新威 7.6 的工步与循环数据取数

---
 battery-business/src/main/java/com/battery/business/service/impl/TestDataQueryServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/battery-business/src/main/java/com/battery/business/service/impl/TestDataQueryServiceImpl.java b/battery-business/src/main/java/com/battery/business/service/impl/TestDataQueryServiceImpl.java
index 1dc8374..75e70d5 100644
--- a/battery-business/src/main/java/com/battery/business/service/impl/TestDataQueryServiceImpl.java
+++ b/battery-business/src/main/java/com/battery/business/service/impl/TestDataQueryServiceImpl.java
@@ -46,13 +46,15 @@
             if (extension == null) continue;
             Map<String, Object> values = com.alibaba.fastjson2.JSON.parseObject(extension.toString());
             // 中值与历史峰谷值是不同测量,不将旧扩展字段回退映射为中值。
-            for (String field : List.of("stepDuration", "startVoltage", "chargeMedianVoltage", "dischargeMedianVoltage"))
+            // 四组容量能量是设备工步层事实:单项列无法表达未确认方向时,调用方读这四组核对。
+            for (String field : List.of("stepDuration", "startVoltage", "chargeMedianVoltage", "dischargeMedianVoltage",
+                    "chargeCapacity", "dischargeCapacity", "chargeEnergy", "dischargeEnergy"))
                 if (values.containsKey(field)) row.put(field, values.get(field));
         }
         return rows;
     }
 
-    /** 查询尚存循环记录,包含设备统计与授权历史导入。 */
+    /** 查询尚存循环记录,包含设备统计、工步层聚合与授权历史导入;携带来源类别供界面标注聚合来源。 */
     @Override public List<Map<String, Object>> cycles(Long testId)
     {
         tests.selectTestById(testId);

--
Gitblit v1.7.1