From 33534cc50083d2bd6775425a08eb49af79e89776 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Sat, 27 Sep 2025 15:11:57 +0800
Subject: [PATCH] =?UTF-8?q?0918=E4=BC=98=E5=8C=96-=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=9B=B2=E7=BA=BF=E5=9B=BE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xzzn/ems/domain/vo/BatteryAveSOCVo.java    |  6 +++---
 .../com/xzzn/ems/domain/vo/BatteryAveTempVo.java   |  6 +++---
 .../mapper/ems/EmsBatteryClusterMapper.xml         |  7 ++++---
 .../resources/mapper/ems/EmsBatteryStackMapper.xml | 14 ++++++++------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveSOCVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveSOCVo.java
index 806491d..d85a12c 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveSOCVo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveSOCVo.java
@@ -11,18 +11,18 @@ public class BatteryAveSOCVo {
     /**
      * 数据时间
      */
-    private Date createDate;
+    private String createDate;
 
     /**
      * 实时SOC
      */
     private BigDecimal batterySOC;
 
-    public Date getCreateDate() {
+    public String getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Date createDate) {
+    public void setCreateDate(String createDate) {
         this.createDate = createDate;
     }
 
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveTempVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveTempVo.java
index bcab5d4..b79e0de 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveTempVo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveTempVo.java
@@ -11,18 +11,18 @@ public class BatteryAveTempVo {
     /**
      * 数据时间
      */
-    private Date createDate;
+    private String createDate;
 
     /**
      * 实时温度
      */
     private BigDecimal batteryTemp;
 
-    public Date getCreateDate() {
+    public String getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Date createDate) {
+    public void setCreateDate(String createDate) {
         this.createDate = createDate;
     }
 
diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
index 829e227..0c693ce 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
@@ -328,13 +328,14 @@
     <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
         select t.site_id,
                 avg(t.avg_cell_temp) as batteryTemp,
-                DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') AS createDate
+               DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
+                DATE_FORMAT(t.create_time, '%H:%i:00') AS createDate
         from ems_battery_cluster t
         where  t.site_id = #{siteId}
           AND t.create_time &gt;= Date(#{startDate})
           AND t.create_time &lt;= #{endDate}
-        GROUP BY t.site_id,DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00')
-        order by createDate
+        GROUP BY t.site_id,dateDay,createDate
+        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 3b7509f..0e3e080 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
@@ -348,13 +348,14 @@
     <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
         select t.site_id,
                 avg(t.avg_temperature) as batteryTemp,
-                DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') AS createDate
+               DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
+                DATE_FORMAT(t.create_time, '%H:%i:00') AS createDate
         from ems_battery_stack t
         where  t.site_id = #{siteId}
                 AND t.create_time &gt;= Date(#{startDate})
                 AND t.create_time &lt;= #{endDate}
-        GROUP BY t.site_id,createDate
-        order by createDate
+        GROUP BY t.site_id,dateDay,createDate
+        order by dateDay,createDate
     </select>
 
     <sql id="statisCommonFilter">
@@ -495,12 +496,13 @@
     <select id="getAveSocList" resultType="com.xzzn.ems.domain.vo.BatteryAveSOCVo">
         select t.site_id,
                avg(t.stack_soc) as batterySOC,
-               DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') AS createDate
+               DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
+               DATE_FORMAT(t.create_time, '%H:%i:00') AS createDate
         from ems_battery_stack t
         where  t.site_id = #{siteId}
           AND t.create_time &gt;= Date(#{startDate})
           AND t.create_time &lt;= #{endDate}
-        GROUP BY t.site_id,DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00')
-        order by createDate
+        GROUP BY t.site_id,dateDay,createDate
+        order by dateDay,createDate
     </select>
 </mapper>
\ No newline at end of file