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 +55475 -1134
375 changed files with 55475 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ff76a73a61 - Show all commits

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>>() {
}));
// 点位匹配数据
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());
List<EmsBatteryData> list = 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()) {
String recordId = record.getKey();
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();
batteryData.setDeviceId(recordId);