修改

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()), // 源字段名转为驼峰

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;

ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml

@@ -191,7 +191,7 @@
             and t.device_category = #{deviceCategory}
         </if>
         <if test="pointName != null and pointName != ''">
-            and t.point_name = #{pointName}
+            and t.point_name like concat('%', #{pointName}, '%')
         </if>
     </select>