From 3c533ccfa4c986894e59914b45f8f042e52be09f Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 28 Feb 2025 14:25:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=94=B6=E7=9B=8A=202025=E5=B9=B42?= =?UTF-8?q?=E6=9C=8828=E6=97=A511:55:47?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manageboard/service/impl/PlantServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java index 3868335..983ff4b 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java @@ -106,7 +106,7 @@ public class PlantServiceImpl extends BaseServiceImpl BigDecimal performance = CalculationUtil.getPerformance(electricityUsage, new BigDecimal(10000), 2); photovoltaicOverviewDTO.setElectricityUsage(performance); //年收益 - AtomicReference incomeTotal = new AtomicReference<>(BigDecimal.ZERO); + /* AtomicReference incomeTotal = new AtomicReference<>(BigDecimal.ZERO); for (TsKvDTO tsKvDTO : tsKvDTOList) { if (!tsKvDTO.getAttrKey().equals(attrA29yy)) { continue; @@ -123,8 +123,10 @@ public class PlantServiceImpl extends BaseServiceImpl incomeTotal.set(incomeTotal.get().add(income)); }); } - // 获取收益 - BigDecimal finalIncomeTotal = incomeTotal.get(); + photovoltaicOverviewDTO.setProfit(finalIncomeTotal.divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP)); + */ + //年收益 + BigDecimal finalIncomeTotal = CalculationUtil.income(electricityUsage, list.get(0).getUnitProfit(), 2);; photovoltaicOverviewDTO.setProfit(finalIncomeTotal.divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP)); //上网量 TODO BigDecimal internetUsage = tsKvDTOList.stream().filter(s -> StringUtils.equals(s.getAttrKey(), attrA30yy))