0918优化-单站监控-实时运行曲线图取值

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

@@ -424,15 +424,15 @@
     </select>
 
     <select id="getStoragePowerList" resultType="com.xzzn.ems.domain.vo.EnergyStoragePowVo">
-        SELECT t.site_id,
-                SUM(t.total_active_power) AS pcsTotalActPower,
-                SUM(t.total_reactive_power) AS pcsTotalReactivePower,
+        SELECT t.site_id,t.device_id as deviceId,
+                t.total_active_power AS pcsTotalActPower,
+                t.total_reactive_power AS pcsTotalReactivePower,
                 DATE_FORMAT(t.data_update_time, '%Y-%m-%d %H:%i:00') AS createDate
         FROM ems_pcs_data t
         WHERE t.site_id =  #{siteId}
         AND t.data_update_time &gt;= Date(#{startDate})
         AND t.data_update_time &lt;= #{endDate}
-        GROUP BY t.site_id, DATE_FORMAT(t.data_update_time, '%Y-%m-%d %H:%i:00')
+        GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,createDate
         ORDER BY createDate
     </select>