From bb85ca1d5e666a3b5f036eaf27a9f01b003c0714 Mon Sep 17 00:00:00 2001 From: zq Date: Thu, 22 Jan 2026 18:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java index 237ac3c..dbf3de8 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java @@ -724,10 +724,11 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i for (Map.Entry> record : records.entrySet()) { String recordId = record.getKey(); Map fields = record.getValue(); + String batteryDeviceId = recordId + deviceId; // 点位匹配数据 - List pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, recordId, DeviceMatchTable.BATTERY.getCode()); + List pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, batteryDeviceId, DeviceMatchTable.BATTERY.getCode()); if (CollectionUtils.isEmpty(pointMatchList)) { - log.info("未找到匹配的点位数据，无法处理单体电池数据，siteId: " + siteId + "，deviceId: " + recordId); + log.info("未找到匹配的点位数据，无法处理单体电池数据，siteId: " + siteId + "，deviceId: " + batteryDeviceId); return; }