diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
index 0459534..661b395 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
@@ -1533,18 +1533,24 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
     }
 
     public String processingDeviceAlarmData(String siteId, String deviceId, String jsonData, Date dataUpdateTime) {
-        String deviceCategory = "";
-        if (deviceId.contains(SiteDevice.ZSLQ.name())) {
+        // 判断设备类型，并调用对应的方法处理数据
+        String deviceCategory = getDeviceCategory(siteId, deviceId);
+        log.info("alarm siteId: {}, deviceId: {}siteId, category: {} ", siteId, deviceId, deviceCategory);
+        if (deviceId.contains(SiteDevice.ZSLQ.name())
+                || DeviceCategory.COOLING.getCode().equals(deviceCategory)) {
             coolingAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
-        } else if (deviceId.contains(SiteDevice.BMSD.name())) {
-            deviceCategory = DeviceCategory.STACK.getCode();
+        } else if (deviceId.contains(SiteDevice.BMSD.name())
+                || DeviceCategory.STACK.getCode().equals(deviceCategory)) {
             stackAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
-        } else if (deviceId.contains(SiteDevice.BMSC.name())) {
-            deviceCategory = DeviceCategory.CLUSTER.getCode();
+        } else if (deviceId.contains(SiteDevice.BMSC.name())
+                || DeviceCategory.CLUSTER.getCode().equals(deviceCategory)) {
             clusterAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
-        } else if (deviceId.contains(SiteDevice.PCS.name())) {
-            deviceCategory = DeviceCategory.PCS.getCode();
+        } else if (deviceId.contains(SiteDevice.PCS.name())
+                || DeviceCategory.PCS.getCode().equals(deviceCategory) ) {
             pcsAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
+        } else {
+            log.info("未找到匹配的点位数据，无法处理设备告警数据，siteId: " + siteId + "，deviceId: " + deviceId);
+            return null;
         }
 
         return deviceCategory;