年收益

2025年2月28日11:55:47

modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java

@@ -106,7 +106,7 @@ public class PlantServiceImpl extends BaseServiceImpl<PlantMapper, PlantEntity>
                 BigDecimal performance = CalculationUtil.getPerformance(electricityUsage, new BigDecimal(10000), 2);
                 photovoltaicOverviewDTO.setElectricityUsage(performance);
                 //年收益
-                AtomicReference<BigDecimal> incomeTotal = new AtomicReference<>(BigDecimal.ZERO);
+               /* AtomicReference<BigDecimal> incomeTotal = new AtomicReference<>(BigDecimal.ZERO);
                 for (TsKvDTO tsKvDTO : tsKvDTOList) {
                     if (!tsKvDTO.getAttrKey().equals(attrA29yy)) {
                         continue;
@@ -123,8 +123,10 @@ public class PlantServiceImpl extends BaseServiceImpl<PlantMapper, PlantEntity>
                                 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))