From 805d7d01fbe63b8bab198e191ea0494594e4fd4b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Feb 2026 09:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E4=BC=8Fmppt=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ho/business/service/impl/EarningsCalculateServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java b/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java index c9e02a5..a8762e6 100644 --- a/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java +++ b/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java @@ -1611,6 +1611,7 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService { LocalDateTime end = mDate.with(TemporalAdjusters.lastDayOfMonth()); String beginTime= DateUtil.format(begin, CommonConstant.DATE_YMD); String endTime = DateUtil.format(end, CommonConstant.DATE_YMD); + String nowTime = DateUtil.format(new Date(), CommonConstant.DATE_YMD); //光伏收益 List pvIncome = earningsCalculateMpptService.countPvIncome(req.getStationId(),beginTime, endTime); Map> mapIncome = pvIncome.stream().collect(Collectors.groupingBy(i ->i.getDate())); @@ -1636,7 +1637,7 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService { if(elecs != null){ pv.setPowerGenerate(elecs.stream().map(ElecMeterValue::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add)); } - if(date.equals(endTime)){ + if(date.equals(nowTime)){ String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + req.getStationId(); //获取今日收益 BigDecimal todayIncone = (BigDecimal)redisService.get(key);