From 566119f6928b2ac47cfa2b940e621892bbc6fb86 Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Thu, 8 Jan 2026 15:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DeviceDataProcessServiceImpl.java    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

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;