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

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

@ -724,10 +724,11 @@ 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();
String batteryDeviceId = recordId + deviceId;
// 点位匹配数据 // 点位匹配数据
List<EmsPointMatch> pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, recordId, DeviceMatchTable.BATTERY.getCode()); List<EmsPointMatch> pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, batteryDeviceId, DeviceMatchTable.BATTERY.getCode());
if (CollectionUtils.isEmpty(pointMatchList)) { if (CollectionUtils.isEmpty(pointMatchList)) {
log.info("未找到匹配的点位数据，无法处理单体电池数据，siteId: " + siteId + "，deviceId: " + recordId); log.info("未找到匹配的点位数据，无法处理单体电池数据，siteId: " + siteId + "，deviceId: " + batteryDeviceId);
return; return;
} }