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-22 18:03:47 +08:00
parent 1db167f0f8
commit ff76a73a61
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,12 +712,6 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
//单体电池 //单体电池
Map<String, Map<String, Object>> records = processData(JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() { Map<String, Map<String, Object>> records = processData(JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() {
})); }));
// 点位匹配数据
List<EmsPointMatch> pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, deviceId, DeviceMatchTable.BATTERY.getCode());
if (CollectionUtils.isEmpty(pointMatchList)) {
log.info("未找到匹配的点位数据，无法处理单体电池数据，siteId: " + siteId + "，deviceId: " + deviceId);
return;
}
Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap = devicePointMatchDataProcessor.getPointEnumMatchMap(siteId, DeviceMatchTable.BATTERY.getCode()); Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap = devicePointMatchDataProcessor.getPointEnumMatchMap(siteId, DeviceMatchTable.BATTERY.getCode());
List<EmsBatteryData> list = new ArrayList<>(); List<EmsBatteryData> list = new ArrayList<>();
List<EmsBatteryDataDailyLatest> dailyList = new ArrayList<>(); List<EmsBatteryDataDailyLatest> dailyList = new ArrayList<>();
@ -730,6 +724,12 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
for (Map.Entry<String, Map<String, Object>> record : records.entrySet()) { for (Map.Entry<String, Map<String, Object>> record : records.entrySet()) {
String recordId = record.getKey(); String recordId = record.getKey();
Map<String, Object> fields = record.getValue(); Map<String, Object> fields = record.getValue();
// 点位匹配数据
List<EmsPointMatch> pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, recordId, DeviceMatchTable.BATTERY.getCode());
if (CollectionUtils.isEmpty(pointMatchList)) {
log.info("未找到匹配的点位数据，无法处理单体电池数据，siteId: " + siteId + "，deviceId: " + recordId);
return;
}
EmsBatteryData batteryData = new EmsBatteryData(); EmsBatteryData batteryData = new EmsBatteryData();
batteryData.setDeviceId(recordId); batteryData.setDeviceId(recordId);