diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java index 614f5a7..c0acd13 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java @@ -41,6 +41,9 @@ public class AmmeterRevenueStatisListVo { /** 组合无功-谷 */ private BigDecimal reActiveValleyPrice = BigDecimal.ZERO; + /** 实际收益 */ + private BigDecimal actualRevenue = BigDecimal.ZERO; + public String getDataTime() { return dataTime; } @@ -128,4 +131,12 @@ public class AmmeterRevenueStatisListVo { public void setReActiveValleyPrice(BigDecimal reActiveValleyPrice) { this.reActiveValleyPrice = reActiveValleyPrice; } + + public BigDecimal getActualRevenue() { + return actualRevenue; + } + + public void setActualRevenue(BigDecimal actualRevenue) { + this.actualRevenue = actualRevenue; + } } 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 dd071a3..5105ca1 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 @@ -347,10 +347,11 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService if (CollectionUtils.isEmpty(resultList)) { return Collections.emptyList(); } - //计算每天总收益 + //计算每天总收益和当日实际收益(放电总-充电总) 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())); }); return resultList; diff --git a/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml index f33854f..3b34ab5 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml @@ -236,14 +236,14 @@