zzkj/smart_storage_java
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

光伏mppt收益修改

Browse Source
This commit is contained in:
root
2026-02-02 09:25:39 +08:00
parent 292a7c7376
commit 805d7d01fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java
View File

@ -1611,6 +1611,7 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
LocalDateTime end = mDate.with(TemporalAdjusters.lastDayOfMonth()); LocalDateTime end = mDate.with(TemporalAdjusters.lastDayOfMonth());
String beginTime= DateUtil.format(begin, CommonConstant.DATE_YMD); String beginTime= DateUtil.format(begin, CommonConstant.DATE_YMD);
String endTime = DateUtil.format(end, CommonConstant.DATE_YMD); String endTime = DateUtil.format(end, CommonConstant.DATE_YMD);
String nowTime = DateUtil.format(new Date(), CommonConstant.DATE_YMD);
//光伏收益 //光伏收益
List<PowerGenerateRespVO> pvIncome = earningsCalculateMpptService.countPvIncome(req.getStationId(),beginTime, endTime); List<PowerGenerateRespVO> pvIncome = earningsCalculateMpptService.countPvIncome(req.getStationId(),beginTime, endTime);
Map<String,List<PowerGenerateRespVO>> mapIncome = pvIncome.stream().collect(Collectors.groupingBy(i ->i.getDate())); Map<String,List<PowerGenerateRespVO>> mapIncome = pvIncome.stream().collect(Collectors.groupingBy(i ->i.getDate()));
@ -1636,7 +1637,7 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
if(elecs != null){ if(elecs != null){
pv.setPowerGenerate(elecs.stream().map(ElecMeterValue::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add)); 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(); String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + req.getStationId();
//获取今日收益 //获取今日收益
BigDecimal todayIncone = (BigDecimal)redisService.get(key); BigDecimal todayIncone = (BigDecimal)redisService.get(key);