From 342439e3a94100973764b0be867c9b103b68214a Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Mon, 30 Jun 2025 23:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=93=E7=94=B5=E6=B1=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ems/EmsBatteryDataMapper.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
index 263c76e..29172e4 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
@@ -178,17 +178,17 @@
     </select>
 
     <select id="getAllBatteryDataByClusterId" resultType="com.xzzn.ems.domain.vo.BatteryDataStatsListVo">
-        SELECT  t.update_time as updateTime, t.voltage,  t.temperature,
+        SELECT  t.data_timestamp as updateTime, t.voltage,  t.temperature,
                 t.soc,  t.soh,  t.device_id as deviceId
         FROM  ems_battery_data t
-        JOIN ( SELECT  device_id, MAX(update_time) AS max_update_time
+        JOIN ( SELECT  device_id, MAX(data_timestamp) AS max_update_time
                 FROM  ems_battery_data
                 WHERE site_id = #{siteId}
                  <if test="clusterDeviceId != null and clusterDeviceId != ''">
                      and cluster_device_id = #{clusterDeviceId}
                 </if>
                 GROUP BY  device_id
-        ) latest  ON   t.device_id = latest.device_id  AND t.update_time = latest.max_update_time
+        ) latest  ON   t.device_id = latest.device_id  AND t.data_timestamp = latest.max_update_time
         WHERE  t.site_id = #{siteId}
         <if test="clusterDeviceId != null and clusterDeviceId != ''">
             and t.cluster_device_id = #{clusterDeviceId}