xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备告警点位数据解析逻辑修改

Browse Source
This commit is contained in:
zq
2026-01-08 15:33:54 +08:00
parent 77a3b6e855
commit 566119f692
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
View File

@ -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;