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

Compare commits

base: xzzn:85b370ea4ca4bb132e3c768bad82b7c8a0295360
Branches Tags
xzzn:main xzzn:dev xzzn:waibao xzzn:prod
...
compare: xzzn:7b25674a259c81a4581bad6585720c64801e6153
Branches Tags
xzzn:dev xzzn:waibao xzzn:main xzzn:prod

2 Commits
85b370ea4c ... 7b25674a25

Author SHA1 Message Date
zq
7b25674a25 Merge branch 'dev' of http://101.43.41.9:13000/xzzn/emsback into dev 2025-12-15 10:55:45 +08:00
zq
d387612b07 平台修改意见20251120-设备详情查询告警点位数据报错问题 2025-12-15 10:55:40 +08:00
2 changed files with 6 additions and 1 deletions
Expand all files Collapse all files

5
ems-common/src/main/java/com/xzzn/common/enums/SiteDevice.java
View File

@ -50,6 +50,11 @@ public enum SiteDevice
*/ */
DH, DH,
/**
* 消防
*/
XF,
/** /**
* 中水冷却 * 中水冷却
*/ */

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

@ -179,7 +179,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
|| deviceId.contains(SiteDevice.METE.name()) || deviceId.contains(SiteDevice.METE.name())
|| deviceId.contains(SiteDevice.METE0.name())) { || deviceId.contains(SiteDevice.METE0.name())) {
meteDataProcess(siteId, deviceId, jsonData, dataUpdateTime); meteDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
} else if (deviceId.contains("XF")) { } else if (deviceId.contains(SiteDevice.XF.name())) {
meteXFProcess(siteId, deviceId, jsonData, dataUpdateTime); meteXFProcess(siteId, deviceId, jsonData, dataUpdateTime);
} else if (deviceId.contains(SiteDevice.DH.name()) || deviceId.contains(SiteDevice.donghuan.name())) { } else if (deviceId.contains(SiteDevice.DH.name()) || deviceId.contains(SiteDevice.donghuan.name())) {
dhDataProcess(siteId, deviceId, jsonData, dataUpdateTime); dhDataProcess(siteId, deviceId, jsonData, dataUpdateTime);