diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
index 22d4514..937bea0 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
@@ -488,10 +488,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
                 List<PcsBranchInfo> pcsBranchInfoList  = new  ArrayList<>();
                 processBranchDataInfo(siteId,pcsId,pcsBranchInfoList);
                 pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList);
-//                // 报警个数
-//                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId,pcsId);
-                // 告警设备点位个数
-                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, pcsId, DeviceCategory.PCS.getCode());
+                // 报警个数
+                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId,pcsId);
+//                // 告警设备点位个数
+//                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, pcsId, DeviceCategory.PCS.getCode());
                 pcsDetailInfoVo.setAlarmNum(alarmNum);
                 pcsDetailInfoVo.setDeviceStatus(pcsDevice.get("deviceStatus") == null ? "" : pcsDevice.get("deviceStatus").toString());
 
@@ -541,8 +541,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
                     bmsOverViewVo.setBatteryDataList(batteryDataLists);
                 }
 
-                // 告警设备点位个数
-                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, stackId, DeviceCategory.STACK.getCode());
+                // 报警个数
+                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, stackId);
+//                // 告警设备点位个数
+//                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, stackId, DeviceCategory.STACK.getCode());
                 bmsOverViewVo.setAlarmNum(alarmNum);
 
                 // 处理枚举匹配字段
@@ -604,8 +606,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
                     dealWithBatteryClusterData(clusterData,clusterDataList);
                     bmsBatteryClusterVo.setBatteryDataList(clusterDataList);
                 }
-                // 告警设备点位个数
-                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, clusterId, DeviceCategory.CLUSTER.getCode());
+                // 报警个数
+                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, clusterId);
+//                // 告警设备点位个数
+//                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, clusterId, DeviceCategory.CLUSTER.getCode());
                 bmsBatteryClusterVo.setAlarmNum(alarmNum);
 
                 // 处理枚举匹配字段
@@ -661,8 +665,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
             EmsCoolingData coolingData = redisCache.getCacheObject(RedisKeyConstants.COOLING + siteId + "_" + coolingId);
             if (coolingData != null) {
                 BeanUtils.copyProperties(coolingData, dataViewVo);
-                // 告警设备点位个数
-                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, coolingId, DeviceCategory.COOLING.getCode());
+                // 报警个数
+                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, coolingId);
+//                // 告警设备点位个数
+//                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, coolingId, DeviceCategory.COOLING.getCode());
                 dataViewVo.setAlarmNum(alarmNum);
             }
 
@@ -750,8 +756,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
             String ammeterId = ammeterDevice.get("id").toString();
             // 从redis取总表详细数据
             EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId);
-            // 告警设备点位个数
-            int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, ammeterId, DeviceCategory.AMMETER.getCode());
+            // 报警个数
+            int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, ammeterId);
+//            // 告警设备点位个数
+//            int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, ammeterId, DeviceCategory.AMMETER.getCode());
 
             AmmeterDataVo ammeterDataVo = new AmmeterDataVo();
             ammeterDataVo.setDeviceName(ammeterDevice.get("deviceName").toString());
@@ -852,8 +860,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
             if (dhData != null) {
                 BeanUtils.copyProperties(dhData, dhDataVo);
             }
-            // 告警设备点位个数
-            int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, dhDeviceId, DeviceCategory.DH.getCode());
+            // 报警个数
+            int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, dhDeviceId);
+//            // 告警设备点位个数
+//            int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, dhDeviceId, DeviceCategory.DH.getCode());
             dhDataVo.setAlarmNum(alarmNum);
 
             // 处理枚举匹配字段
@@ -884,8 +894,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
             if (xfData != null) {
                 BeanUtils.copyProperties(xfData, xfDataVo);
                 xfDataVo.setDataUpdateTime(xfData.getDataTimestamp());
-                // 告警设备点位个数
-                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, xfDeviceId, DeviceCategory.XF.getCode());
+                // 报警个数
+                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, xfDeviceId);
+//                // 告警设备点位个数
+//                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, xfDeviceId, DeviceCategory.XF.getCode());
                 xfDataVo.setAlarmNum(alarmNum);
             }
             xfDataVo.setEmsCommunicationStatus(xfDevice.get("communicationStatus") == null ? "" : xfDevice.get("communicationStatus").toString());
@@ -912,8 +924,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
             EmsEmsData emsData = redisCache.getCacheObject(RedisKeyConstants.EMS + siteId + "_" + emsDeviceId);
             if (emsData != null) {
                 BeanUtils.copyProperties(emsData, emsDataVo);
-                // 告警设备点位个数
-                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, emsDeviceId, DeviceCategory.EMS.getCode());
+                // 报警个数
+                int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, emsDeviceId);
+//                // 告警设备点位个数
+//                int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, emsDeviceId, DeviceCategory.EMS.getCode());
                 emsDataVo.setAlarmNum(alarmNum);
             }