From c068e7d4ab4e9aa044eda8e011065c5bf124f9d9 Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Sun, 30 Nov 2025 10:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=99=E7=82=B9-=E7=94=B5?=
 =?UTF-8?q?=E5=8A=A8=E6=89=80=E5=86=85=E9=83=A8=E5=AE=9E=E6=97=B6=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ems/EmsBatteryClusterMapper.xml     | 12 ++++++++----
 .../mapper/ems/EmsBatteryStackMapper.xml       | 18 +++++++++++-------
 .../resources/mapper/ems/EmsPcsDataMapper.xml  |  9 ++++++---
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
index 90a8074..6268281 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
@@ -331,10 +331,14 @@
                DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
                 DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
         from ems_battery_cluster t
-        where  t.site_id = #{siteId}
-        AND Date(t.create_time) between #{startDate} and #{endDate}
-        GROUP BY t.site_id,dateDay,createDate
-        order by dateDay,createDate
+        WHERE t.site_id = #{siteId}
+        AND t.create_time &gt;= #{startDate}
+        AND t.create_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
+        GROUP BY t.site_id,
+        DATE_FORMAT(t.create_time, '%Y-%m-%d'),
+        DATE_FORMAT(t.create_time, '%H:00:00')
+        ORDER BY dateDay, createDate
+
     </select>
 
     <select id="getClusterDataByHour" resultType="com.xzzn.ems.domain.vo.ClusterStatisListVo">
diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
index 58171c9..2494b08 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
@@ -347,14 +347,17 @@
 
     <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
         select t.site_id,
-               round(avg(t.avg_cell_temp)) as batteryTemp,
+               round(avg(t.avg_temperature)) as batteryTemp,
                DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
-                DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
+               DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
         from ems_battery_stack t
-        where  t.site_id = #{siteId}
-          AND Date(t.create_time) between #{startDate} and #{endDate}
-        GROUP BY t.site_id,dateDay,createDate
-        order by dateDay,createDate
+        WHERE t.site_id = #{siteId}
+          AND t.create_time &gt;= #{startDate}
+          AND t.create_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
+        GROUP BY t.site_id,
+        DATE_FORMAT(t.create_time, '%Y-%m-%d'),
+        DATE_FORMAT(t.create_time, '%H:00:00')
+        ORDER BY dateDay, createDate
     </select>
 
     <sql id="statisCommonFilter">
@@ -499,7 +502,8 @@
                DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
         from ems_battery_stack t
         where  t.site_id = #{siteId}
-        AND Date(t.create_time) between #{startDate} and #{endDate}
+        AND t.create_time &gt;= #{startDate}
+        AND t.create_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
         GROUP BY t.site_id,dateDay,createDate
         order by dateDay,createDate
     </select>
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index 6359898..1d064cb 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -465,7 +465,8 @@
                 DATE_FORMAT(t.data_update_time, '%H:%i:00') AS createDate
         FROM ems_pcs_data t
         WHERE t.site_id =  #{siteId}
-        AND Date(t.data_update_time) between #{startDate} and #{endDate}
+        AND t.data_update_time &gt;= #{startDate}
+        AND t.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
         AND minute(t.data_update_time) = 0
         GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate
         ORDER BY dateDay,createDate
@@ -587,7 +588,8 @@
         from  ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%Y-%m-%d %H:00:00') AS dateHour,MAX(p.data_update_time) as max_update_time
                 FROM ems_pcs_data p
                 WHERE p.site_id =  #{siteId}
-                AND Date(p.data_update_time) between #{startDate} and #{endDate}
+                AND p.data_update_time &gt;= #{startDate}
+                AND p.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
                 AND minute(p.data_update_time) = 0
                 GROUP BY  p.site_id, p.device_id,dateHour
         ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
@@ -610,7 +612,8 @@
         from  ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%Y-%m-%d %H:00:00') AS dateHour,MAX(p.data_update_time) as max_update_time
                 FROM ems_pcs_data p
                 WHERE p.site_id =  #{siteId}
-                AND Date(p.data_update_time) between #{startDate} and #{endDate}
+                AND p.data_update_time &gt;= #{startDate}
+                AND p.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
                 AND minute(p.data_update_time) = 0
                 GROUP BY  p.site_id, p.device_id,dateHour
         ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id