From 194429af2d7028115373350f23803340e479ebb1 Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Fri, 23 Jan 2026 19:29:24 +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    | 3 +++
 .../com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 dbf3de8..ce08e73 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
@@ -605,6 +605,9 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
      */
     private void saveDeviceData(List<EmsPointMatch> pointMatchList, Map<String, Object> obj,
                                 Object entity, Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap) {
+        if (null == obj || obj.isEmpty()) {
+            return;
+        }
         Map<String, String> pointMatchMap = pointMatchList.stream()
                 .collect(Collectors.toMap(
                         data -> StringUtils.toCamelCase(data.getMatchField()), // 源字段名转为驼峰
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
index 5105ca1..21b523f 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
@@ -351,7 +351,7 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
         resultList.forEach(ammeterRevenue -> {
             ammeterRevenue.setActiveTotalPrice(ammeterRevenue.getActivePeakPrice().add(ammeterRevenue.getActiveHighPrice()).add(ammeterRevenue.getActiveFlatPrice()).add(ammeterRevenue.getActiveValleyPrice()));
             ammeterRevenue.setReActiveTotalPrice(ammeterRevenue.getReActivePeakPrice().add(ammeterRevenue.getReActiveHighPrice()).add(ammeterRevenue.getReActiveFlatPrice()).add(ammeterRevenue.getReActiveValleyPrice()));
-            ammeterRevenue.setActualRevenue(ammeterRevenue.getReActiveFlatPrice().subtract(ammeterRevenue.getActiveTotalPrice()));
+            ammeterRevenue.setActualRevenue(ammeterRevenue.getReActiveTotalPrice().subtract(ammeterRevenue.getActiveTotalPrice()));
         });
 
         return resultList;