设备监控-实时运行页面曲线按照每分钟展示

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

@@ -331,18 +331,27 @@
     </select>
 
     <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
-        select t.site_id,
-               round(avg(t.avg_cell_temp)) as batteryTemp,
-               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 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
+        WITH ranked AS (
+        SELECT
+        *,
+        date_format(create_time, '%Y-%m-%d %H:00:00') + INTERVAL FLOOR(MINUTE(create_time) / 5) * 5 MINUTE AS group_time,
+        ROW_NUMBER() OVER (PARTITION BY date_format(create_time, '%Y-%m-%d %H:00:00'), FLOOR(MINUTE(create_time) / 5) ORDER BY create_time) as rn
+        FROM
+        ems_battery_cluster
+        where site_id = #{siteId}
+        and create_time &gt;= #{startDate}
+        and create_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
+        and avg_cell_temp is not null
+        )
+        SELECT
+        site_id,
+        round(avg(avg_cell_temp)) as batteryTemp,
+        DATE_FORMAT(group_time, '%Y-%m-%d') as dateDay,
+        DATE_FORMAT(group_time, '%H:%i:00') as createDate,
+        group_time as groupTime
+        FROM
+        ranked
+        GROUP BY site_id,groupTime
 
     </select>