Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java
#	ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml

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

@@ -177,6 +177,24 @@
         SELECT NULL AS type, NULL AS device_id FROM DUAL WHERE 1=0
     </select>
 
+    <select id="getAllBatteryDataByClusterId" parameterType="String" resultType="com.xzzn.ems.domain.vo.BatteryDataStatsListVo">
+        SELECT
+            update_time as updateTime,
+            voltage, temperature, soc, soh,
+            device_id as deviceId
+        FROM (
+                 SELECT
+                     t.update_time, t.voltage, t.temperature, t.soc, t.soh, t.device_id,
+                     ROW_NUMBER() OVER (
+                            PARTITION BY t.device_id ORDER BY t.update_time DESC
+                    ) AS rn
+                 FROM ems_battery_data t
+                 WHERE t.cluster_device_id =  #{clusterDeviceId}
+             ) ranked
+        WHERE rn = 1
+    </select>
+
+
     <insert id="insertEmsBatteryDataList" parameterType="java.util.List">
         INSERT INTO ems_battery_data (
         battery_pack, battery_cluster, battery_cell_id,