From f05ba30f1486bf928dda7f623013b36acffaef71 Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Thu, 15 Jan 2026 15:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7-PCS=E5=AE=9E=E6=97=B6=E6=9C=89=E5=8A=9F=E5=8A=9F?=
 =?UTF-8?q?=E7=8E=87=E4=B8=8E=E6=80=BB=E4=BA=A4=E6=B5=81=E6=9C=89=E5=8A=9F?=
 =?UTF-8?q?=E5=8A=9F=E7=8E=87=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ems/EmsPcsDataMapper.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index b6f0bba..ecdedb8 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -382,12 +382,14 @@
     </select>
 
     <select id="getSiteRunningHeadInfo" parameterType="String" resultType="com.xzzn.ems.domain.vo.SiteMonitorRunningHeadInfoVo">
-        SELECT
-            SUM(t.total_active_power)        as totalActivePower,
-            SUM(t.total_reactive_power)      as totalReactivePower,
-            sum(t.daily_ac_charge_energy)    as dayChargedCap,
-            sum(t.daily_ac_discharge_energy) as dayDisChargedCap
+        SELECT SUM(pd.total_active_power)        as totalActivePower,
+               SUM(pd.total_reactive_power)      as totalReactivePower,
+               sum(pd.daily_ac_charge_energy)    as dayChargedCap,
+               sum(pd.daily_ac_discharge_energy) as dayDisChargedCap
         FROM (
+                 SELECT
+                     t.*, ROW_NUMBER() OVER(PARTITION BY t.device_id ORDER BY t.data_update_time desc) AS rn
+                 FROM (
                  SELECT p.device_id, MAX(p.data_update_time) AS max_update_time
                  FROM ems_pcs_data p
                  where p.site_id = #{siteId}
@@ -395,6 +397,8 @@
              ) latest inner join ems_pcs_data t ON latest.device_id = t.device_id
             AND latest.max_update_time = t.data_update_time
             AND t.site_id = #{siteId}
+             ) AS pd
+        WHERE rn = 1;
     </select>
 
     <select id="getElectDataList" resultType="com.xzzn.ems.domain.vo.ElectricIndexList">