From ff76a73a6192eb13a00088f6e7adec47292454ef Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Thu, 22 Jan 2026 18:03:47 +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

---
 .../service/impl/DeviceDataProcessServiceImpl.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 7e78490..237ac3c 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
@@ -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);