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

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +55308 -1130
374 changed files with 55308 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 566119f692 - Show all commits

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) { 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); coolingAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
} else if (deviceId.contains(SiteDevice.BMSD.name())) { } else if (deviceId.contains(SiteDevice.BMSD.name())
deviceCategory = DeviceCategory.STACK.getCode(); || DeviceCategory.STACK.getCode().equals(deviceCategory)) {
stackAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime); stackAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
} else if (deviceId.contains(SiteDevice.BMSC.name())) { } else if (deviceId.contains(SiteDevice.BMSC.name())
deviceCategory = DeviceCategory.CLUSTER.getCode(); || DeviceCategory.CLUSTER.getCode().equals(deviceCategory)) {
clusterAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime); clusterAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
} else if (deviceId.contains(SiteDevice.PCS.name())) { } else if (deviceId.contains(SiteDevice.PCS.name())
deviceCategory = DeviceCategory.PCS.getCode(); || DeviceCategory.PCS.getCode().equals(deviceCategory) ) {
pcsAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime); pcsAlarmDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
} else {
log.info("未找到匹配的点位数据，无法处理设备告警数据，siteId: " + siteId + "，deviceId: " + deviceId);
return null;
} }
return deviceCategory; return deviceCategory;