ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml

@@ -470,17 +470,28 @@
     </select>
 
     <select id="getStoragePowerList" resultType="com.xzzn.ems.domain.vo.EnergyStoragePowVo">
-        SELECT t.site_id,t.device_id as deviceId,
-                t.total_active_power AS pcsTotalActPower,
-                t.total_reactive_power AS pcsTotalReactivePower,
-                DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
-                DATE_FORMAT(t.data_update_time, '%H:%i:00') AS createDate
-        FROM ems_pcs_data t
-        WHERE t.site_id =  #{siteId}
-        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
+        WITH ranked AS (
+        SELECT
+        *,
+        ROW_NUMBER() OVER(PARTITION BY device_id , DATE_FORMAT(data_update_time, '%Y-%m-%d %H:%i') ORDER BY data_update_time DESC) as rn
+        FROM
+        ems_pcs_data
+        where site_id = #{siteId}
+        and data_update_time &gt;= #{startDate}
+        AND data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
+        )
+        select
+        site_id,
+        device_id as deviceId,
+        total_active_power as pcsTotalActPower,
+        total_reactive_power as pcsTotalReactivePower,
+        DATE_FORMAT(create_time, '%Y-%m-%d') as dateDay,
+        DATE_FORMAT(data_update_time, '%H:%i:00') as createDate
+        from
+        ranked
+        where
+        rn = 1
+        GROUP BY site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate
         ORDER BY dateDay,createDate
     </select>