xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
zq
2026-01-23 19:29:24 +08:00
parent b3f7ca7a81
commit 194429af2d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,6 +605,9 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
*/ */
private void saveDeviceData(List<EmsPointMatch> pointMatchList, Map<String, Object> obj, private void saveDeviceData(List<EmsPointMatch> pointMatchList, Map<String, Object> obj,
Object entity, Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap) { Object entity, Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap) {
if (null == obj || obj.isEmpty()) {
return;
}
Map<String, String> pointMatchMap = pointMatchList.stream() Map<String, String> pointMatchMap = pointMatchList.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
data -> StringUtils.toCamelCase(data.getMatchField()), // 源字段名转为驼峰 data -> StringUtils.toCamelCase(data.getMatchField()), // 源字段名转为驼峰

2
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
View File

@ -351,7 +351,7 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
resultList.forEach(ammeterRevenue -> { resultList.forEach(ammeterRevenue -> {
ammeterRevenue.setActiveTotalPrice(ammeterRevenue.getActivePeakPrice().add(ammeterRevenue.getActiveHighPrice()).add(ammeterRevenue.getActiveFlatPrice()).add(ammeterRevenue.getActiveValleyPrice())); 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.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; return resultList;