From 3eb8636e53a72f7eb67405f99e5882b1343a692b Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Wed, 9 Jul 2025 14:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8-sql?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ems/EmsBatteryClusterMapper.xml    |  8 +++---
 .../mapper/ems/EmsBatteryStackMapper.xml      | 26 ++-----------------
 .../resources/mapper/ems/EmsPcsDataMapper.xml | 23 ++--------------
 3 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
index 96809e0..7eee732 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
@@ -322,7 +322,6 @@
                 GROUP BY p.site_id,p.device_id
                 ) latest on t.device_id = latest.device_id and t.update_time = latest.max_update_time
         where t.site_id = #{siteId} and t.stack_device_id = #{stackDeviceId}
-        group by t.cluster_voltage,t.cluster_current,t.current_soc,t.site_id,t.device_id,t.max_cell_voltage,t.min_cell_voltage,
                  t.max_cell_temp,t.min_cell_temp
     </select>
 
@@ -335,7 +334,7 @@
                  inner join (select site_id,create_time,MIN(device_id) as device_id
                              from ems_battery_cluster
                              where site_id = #{siteId}
-                               AND create_time &gt;= Date(#{startDate})
+                               AND create_time &gt;= #{startDate}
             AND create_time &lt;= #{endDate}
         GROUP BY site_id,create_time
             ) temp on t.site_id = temp.site_id and t.create_time = temp.create_time and t.device_id = temp.device_id
@@ -349,7 +348,7 @@
         inner join (select site_id,create_time,MIN(device_id) as device_id
                              from ems_battery_cluster
                              where site_id = #{siteId}
-                             AND create_time &gt;= Date(#{startDate})
+                             AND create_time &gt;= #{startDate}
                              AND create_time &lt;= #{endDate}
                         GROUP BY site_id,create_time
             ) temp on t.site_id = temp.site_id and t.create_time = temp.create_time and t.device_id = temp.device_id
@@ -369,13 +368,12 @@
                 FROM ems_battery_cluster p
                 WHERE p.stack_device_id = #{stackId}
                 AND p.device_id = #{clusterId}
-                AND DATE( p.update_time) = DATE(#{dateTime})
+                AND DATE(p.update_time) = #{dateTime}
                 GROUP BY p.site_id, p.device_id, statisDate
         ) latest
         INNER JOIN ems_battery_cluster t ON latest.site_id = t.site_id
         AND latest.device_id = t.device_id
         AND latest.max_update_time = t.update_time
-        GROUP BY statisDate, maxTemp, maxTempId, minTemp, minTempId, maxVoltage, maxVoltageId, minVoltage, minVoltageId
         ORDER BY statisDate
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
index a1516ca..12d2aba 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
@@ -293,10 +293,10 @@
         WHERE p.site_id = #{siteId}
         and p.device_id = #{deviceId}
         <if test="startDate != null">
-            AND p.update_time &gt;= DATE(#{startDate})
+            AND p.update_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND p.update_time &lt; DATE(#{endDate})
+            AND p.update_time &lt; #{endDate}
         </if>
     </sql>
 
@@ -317,22 +317,6 @@
         </choose>
     </sql>
 
-    <sql id="groupChooseFilter">
-        <choose>
-            <when test="dataType == 1">
-                ,temp
-            </when>
-            <when test="dataType == 2">
-                ,voltage
-            </when>
-            <when test="dataType == 3">
-                ,current
-            </when>
-            <when test="dataType == 4">
-                ,soc
-            </when>
-        </choose>
-    </sql>
     <select id="getStackDataByHour" parameterType="com.xzzn.ems.domain.vo.DateSearchRequest" resultType="com.xzzn.ems.domain.vo.StackStatisListVo">
         select  latest.dateHour as statisDate,
         <include refid="dataTypeChooseFilter"/>
@@ -343,8 +327,6 @@
         ) latest inner join ems_battery_stack t ON latest.site_id = t.site_id
         AND latest.device_id = t.device_id
         AND latest.max_update_time = t.update_time
-        group by statisDate
-        <include refid="groupChooseFilter"/>
         order by statisDate desc
     </select>
 
@@ -358,8 +340,6 @@
         ) latest inner join ems_battery_stack t ON latest.site_id = t.site_id
         AND latest.device_id = t.device_id
         AND latest.max_update_time = t.update_time
-        group by statisDate
-        <include refid="groupChooseFilter"/>
         order by statisDate desc
     </select>
 
@@ -373,8 +353,6 @@
         ) latest inner join ems_battery_stack t ON latest.site_id = t.site_id
         AND latest.device_id = t.device_id
         AND latest.max_update_time = t.update_time
-        group by statisDate
-        <include refid="groupChooseFilter"/>
         order by statisDate desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index 69b287e..3bdd797 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -464,10 +464,10 @@
         WHERE p.site_id = #{siteId}
         and p.device_id = #{deviceId}
         <if test="startDate != null">
-            AND p.data_update_time &gt;= DATE(#{startDate})
+            AND p.data_update_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND p.data_update_time &lt; DATE(#{endDate})
+            AND p.data_update_time &lt; #{endDate}
         </if>
     </sql>
 
@@ -487,19 +487,6 @@
         </choose>
     </sql>
 
-    <sql id="groupChooseFilter">
-        <choose>
-            <when test="dataType == 1">
-                ,activePower
-            </when>
-            <when test="dataType == 2">
-                ,reactivePower
-            </when>
-            <when test="dataType == 3">
-                ,uCurrent,vCurrent,wCurrent
-            </when>
-        </choose>
-    </sql>
     <select id="getPcsActivePowerByDay" parameterType="com.xzzn.ems.domain.vo.DateSearchRequest" resultType="com.xzzn.ems.domain.vo.PcsStatisListVo">
         select  CONCAT(t.date_month,'/',t.date_day) as statisDate,
             <include refid="dataTypeChooseFilter"/>
@@ -512,8 +499,6 @@
                 AND latest.max_update_time = t.data_update_time
                 and latest.date_month = t.date_month
                 and latest.date_day = t.date_day
-        group by statisDate
-        <include refid="groupChooseFilter"/>
         order by statisDate desc
     </select>
 
@@ -528,8 +513,6 @@
         AND latest.device_id = t.device_id
         AND latest.max_update_time = t.data_update_time
         and latest.date_month = t.date_month
-        group by statisDate
-        <include refid="groupChooseFilter"/>
         order by statisDate desc
     </select>
 
@@ -543,8 +526,6 @@
             ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
                 AND latest.device_id = t.device_id
                 AND latest.max_update_time = t.data_update_time
-        group by statisDate
-        <include refid="groupChooseFilter"/>
         order by statisDate desc
     </select>
 </mapper>
\ No newline at end of file