From 4220194f54535388daad46136f8da0452441b806 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 02 九月 2026 14:09:58 +0800
Subject: [PATCH] 补齐控制台来源身份与时间字段

---
 ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
index 9e16f96..65a78bb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
@@ -326,7 +326,8 @@
                sample.device_time_utc recordedAt, sample.device_time_utc absoluteTime,
                sample.device_time_utc deviceTime, sample.received_at_utc serverReceivedAt,
                sample.voltage_v voltage, sample.current_a current, sample.capacity_ah capacity,
-               sample.energy_wh energy, channel.devid deviceId, channel.chlid channelId
+               sample.energy_wh energy, channel.adapter_id adapterId, channel.adapter_code adapterCode,
+               channel.devtype devtype, channel.devid deviceId, channel.subdevid subdevid, channel.chlid channelId
         from t_test_sample sample
         join t_test_battery battery on battery.relation_id = sample.binding_id and battery.del_flag = 0
         join t_detection_channel channel on channel.channel_id = sample.channel_id and channel.del_flag = 0
@@ -341,18 +342,21 @@
                sample.step_type stepType, coalesce(sample.step_name, sample.step_type) actualStepLabel,
                count(*) recordCount,
                min(sample.device_time_utc) recordedAt, min(sample.device_time_utc) absoluteTime,
+               max(sample.received_at_utc) serverReceivedAt,
                timestampdiff(second, min(sample.device_time_utc), max(sample.device_time_utc)) stepDuration,
                max(sample.capacity_ah) capacity, max(sample.energy_wh) energy,
                min(sample.voltage_v) startVoltage,
                max(sample.voltage_v) endVoltage,
                max(case when sample.current_a &gt;= 0 then sample.voltage_v end) chargePeakVoltage,
                min(case when sample.current_a &lt; 0 then sample.voltage_v end) dischargeValleyVoltage,
-               channel.devid deviceId, channel.chlid channelId
+               channel.adapter_id adapterId, channel.adapter_code adapterCode, channel.devtype devtype,
+               channel.devid deviceId, channel.subdevid subdevid, channel.chlid channelId
         from t_test_sample sample
         join t_test_battery battery on battery.relation_id = sample.binding_id and battery.del_flag = 0
         join t_detection_channel channel on channel.channel_id = sample.channel_id and channel.del_flag = 0
         where sample.test_id = #{testId}
-        group by sample.binding_id, battery.battery_no, channel.devid, channel.chlid, sample.cycle_no, sample.step_no,
+        group by sample.binding_id, battery.battery_no, channel.adapter_id, channel.adapter_code, channel.devtype,
+                 channel.devid, channel.subdevid, channel.chlid, sample.cycle_no, sample.step_no,
                  sample.step_type, sample.step_name
         order by sample.cycle_no, sample.step_no, battery.battery_no
     </select>
@@ -361,6 +365,7 @@
                concat('CYCLE-', channel.devid, '-', channel.chlid, '-', sample.cycle_no) recordNo,
                battery.battery_no batteryNo, sample.cycle_no cycleNo, count(*) recordCount,
                min(sample.device_time_utc) recordedAt, min(sample.device_time_utc) absoluteTime,
+               max(sample.received_at_utc) serverReceivedAt,
                greatest(max(case when sample.current_a &gt;= 0 then sample.capacity_ah end), 0) chargeCapacity,
                greatest(max(case when sample.current_a &lt; 0 then sample.capacity_ah end), 0) dischargeCapacity,
                greatest(max(case when sample.current_a &gt;= 0 then sample.energy_wh end), 0) chargeEnergy,
@@ -369,12 +374,14 @@
                     then greatest(max(case when sample.current_a &lt; 0 then sample.capacity_ah end), 0)
                          / max(case when sample.current_a &gt;= 0 then sample.capacity_ah end) * 100
                     else 0 end efficiency,
-               channel.devid deviceId, channel.chlid channelId
+               channel.adapter_id adapterId, channel.adapter_code adapterCode, channel.devtype devtype,
+               channel.devid deviceId, channel.subdevid subdevid, channel.chlid channelId
         from t_test_sample sample
         join t_test_battery battery on battery.relation_id = sample.binding_id and battery.del_flag = 0
         join t_detection_channel channel on channel.channel_id = sample.channel_id and channel.del_flag = 0
         where sample.test_id = #{testId}
-        group by sample.binding_id, battery.battery_no, channel.devid, channel.chlid, sample.cycle_no
+        group by sample.binding_id, battery.battery_no, channel.adapter_id, channel.adapter_code, channel.devtype,
+                 channel.devid, channel.subdevid, channel.chlid, sample.cycle_no
         order by sample.cycle_no, battery.battery_no
     </select>
     <select id="selectTestResults" parameterType="TTestResult" resultMap="TTestResultResultMap">

--
Gitblit v1.7.1