diff --git a/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml
index c7b8522..2c92e25 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml
@@ -120,4 +120,16 @@
         from ems_alarm_records
         where site_id = #{siteId}
     </select>
+
+    <select id="getAlarmTrendList" resultType="com.xzzn.ems.domain.vo.AlarmTrendList">
+        select MONTH(alarm_start_time) as dateMonth,COUNT(1) as alarmNum
+        from ems_alarm_records
+        group by MONTH(alarm_start_time)
+    </select>
+
+    <select id="getDeviceAlarmPropList" resultType="com.xzzn.ems.domain.vo.DeviceAlarmProportionList">
+        select device_type as type,COUNT(1) as alarmNum
+        from ems_alarm_records
+        group by device_type
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index aff5485..a6e6c1c 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -223,12 +223,35 @@
     </select>
 
     <select id="getSiteRunningHeadInfo" parameterType="Long" resultType="com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo">
-        SELECT total_active_power as totalActivePower,
-               total_reactive_power as totalReactivePower,
-               daily_ac_charge_energy as dayChargedCap,
-               daily_ac_discharge_energy as dayDisChargedCap
-        FROM ems_pcs_data
-        WHERE site_id = #{siteId} AND  DATE(create_time) = DATE(NOW())
-        ORDER BY create_time desc limit 1
+        select sum(a.total_active_power) as totalActivePower,
+               sum(a.total_reactive_power) as totalReactivePower,
+               sum(a.daily_ac_charge_energy) as dayChargedCap,
+               sum(a.daily_ac_discharge_energy) as dayDisChargedCap
+        from (
+                 select t.total_active_power,t.total_reactive_power,
+                        t.daily_ac_charge_energy,t.daily_ac_discharge_energy,
+                        t.device_id,t.site_id,t.create_time
+                 from ems_pcs_data t
+                 where t.site_id = #{siteId}
+                 and t.create_time = (select MAX(create_time) FROM ems_pcs_data where site_id = t.site_id and device_id = t.device_id)
+                group by t.device_id,t.total_active_power, total_reactive_power,
+                    t.daily_ac_charge_energy,t.daily_ac_discharge_energy,t.site_id,t.create_time
+            ) a
+    </select>
+
+    <select id="getElectDataList" resultType="com.xzzn.ems.domain.vo.ElectricIndexList">
+        select tmp.date_month as dateMonth,
+                SUM(tmp.daily_ac_charge_energy) as chargeEnergy,
+                SUM(tmp.daily_ac_discharge_energy) as disChargeEnergy
+        from
+            (
+                select date_month,date_day,
+                       t.daily_ac_charge_energy,t.daily_ac_discharge_energy,t.create_time
+                from ems_pcs_data t
+                where  t.create_time = (select MAX(create_time) FROM ems_pcs_data where site_id = t.site_id
+                                          and device_id = t.device_id and date_day = t.date_day and date_month = t.date_month)
+
+            ) as tmp
+        group by dateMonth
     </select>
 </mapper>
\ No newline at end of file