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

增加今日收益计算

Browse Source
This commit is contained in:
root
2025-10-30 15:06:31 +08:00
parent 530f4396f7
commit 855967d083
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business-service-api/src/main/java/com/ho/business/vo/resp/iargeScreen/AnnualOverviewResp.java
View File

@ -31,6 +31,8 @@ public class AnnualOverviewResp {
@ApiModelProperty(value = "年总充") @ApiModelProperty(value = "年总充")
BigDecimal yearCharge; BigDecimal yearCharge;
@ApiModelProperty(value = "今日收益")
BigDecimal todayProfit;
@ApiModelProperty(value = "昨日收益") @ApiModelProperty(value = "昨日收益")
BigDecimal yestProfit; BigDecimal yestProfit;

30
business-service-dao/src/main/java/com/ho/business/service/impl/IargeScreenShowServiceImpl.java
View File

@ -282,6 +282,7 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
annualOverviewResp.setYestProfit(overviewProfit.getYestProfit()==null?null:overviewProfit.getYestProfit().multiply(new BigDecimal("10000"))); annualOverviewResp.setYestProfit(overviewProfit.getYestProfit()==null?null:overviewProfit.getYestProfit().multiply(new BigDecimal("10000")));
annualOverviewResp.setYearProfit(overviewProfit.getYearProfit()==null?null:overviewProfit.getYearProfit().multiply(new BigDecimal("10000"))); annualOverviewResp.setYearProfit(overviewProfit.getYearProfit()==null?null:overviewProfit.getYearProfit().multiply(new BigDecimal("10000")));
annualOverviewResp.setTotalProfit(overviewProfit.getTotalProfit()==null?null:overviewProfit.getTotalProfit().multiply(new BigDecimal("10000"))); annualOverviewResp.setTotalProfit(overviewProfit.getTotalProfit()==null?null:overviewProfit.getTotalProfit().multiply(new BigDecimal("10000")));
annualOverviewResp.setTodayProfit(overviewProfit.getTodayProfit()==null?null:overviewProfit.getTodayProfit().multiply(new BigDecimal("10000")));
//时间当年 //时间当年
DateTime begin = DateUtil.beginOfYear(new Date()); DateTime begin = DateUtil.beginOfYear(new Date());
String beginString = DateUtil.format(begin, CommonConstant.DATE_YMD); String beginString = DateUtil.format(begin, CommonConstant.DATE_YMD);
@ -1532,7 +1533,7 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
if(beginDate == null){ if(beginDate == null){
return annualOverviewResp; return annualOverviewResp;
} }
Date date = DateUtil.yesterday(); Date date = DateUtil.date();
Date startDate = DateUtil.beginOfYear(beginDate); Date startDate = DateUtil.beginOfYear(beginDate);
Date endDate = DateUtil.endOfDay(date); Date endDate = DateUtil.endOfDay(date);
String begin = DateUtil.format(startDate, CommonConstant.DATE_YMD); String begin = DateUtil.format(startDate, CommonConstant.DATE_YMD);
@ -1546,6 +1547,7 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
profitList.add(dayProfitType); profitList.add(dayProfitType);
} }
} }
//计算总收益
Map<String, List<DayProfitType>> dayMap = profitList.stream().collect(Collectors.groupingBy(DayProfitType::getDay)); Map<String, List<DayProfitType>> dayMap = profitList.stream().collect(Collectors.groupingBy(DayProfitType::getDay));
List<AnnualChartValue> yearProfitCurve = new ArrayList<>(); List<AnnualChartValue> yearProfitCurve = new ArrayList<>();
getAnnualOverviewResp(yearProfitCurve, dateTimes, CommonConstant.DATE_Y, dayMap); getAnnualOverviewResp(yearProfitCurve, dateTimes, CommonConstant.DATE_Y, dayMap);
@ -1554,6 +1556,7 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
yearProfit = yearProfit.add(chartValue.getProfit()); yearProfit = yearProfit.add(chartValue.getProfit());
} }
annualOverviewResp.setTotalProfit(yearProfit); annualOverviewResp.setTotalProfit(yearProfit);
//计算年收益
startDate = DateUtil.beginOfYear(date); startDate = DateUtil.beginOfYear(date);
List<DateTime> nowDateTime = DateUtil.rangeToList(startDate, endDate, DateField.MONTH); List<DateTime> nowDateTime = DateUtil.rangeToList(startDate, endDate, DateField.MONTH);
List<AnnualChartValue> monthProfitCurve = new ArrayList<>(); List<AnnualChartValue> monthProfitCurve = new ArrayList<>();
@ -1563,6 +1566,18 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
monthProfit = monthProfit.add(chartValue.getProfit()); monthProfit = monthProfit.add(chartValue.getProfit());
} }
annualOverviewResp.setYearProfit(monthProfit); annualOverviewResp.setYearProfit(monthProfit);
// 计算今日收益
List<DateTime> todayDateTime = DateUtil.rangeToList(endDate, endDate, DateField.DAY_OF_MONTH);
List<AnnualChartValue> todayProfitCurve = new ArrayList<>();
getAnnualOverviewResp(todayProfitCurve, todayDateTime, CommonConstant.DATE_YMD, dayMap);
BigDecimal todayProfit = BigDecimal.ZERO;
for (AnnualChartValue chartValue : todayProfitCurve) {
todayProfit = todayProfit.add(chartValue.getProfit());
}
annualOverviewResp.setTodayProfit(todayProfit);
// 计算昨日收益
date = DateUtil.yesterday();
endDate = DateUtil.endOfDay(date);
List<DateTime> dayDateTime = DateUtil.rangeToList(endDate, endDate, DateField.DAY_OF_MONTH); List<DateTime> dayDateTime = DateUtil.rangeToList(endDate, endDate, DateField.DAY_OF_MONTH);
List<AnnualChartValue> dayProfitCurve = new ArrayList<>(); List<AnnualChartValue> dayProfitCurve = new ArrayList<>();
getAnnualOverviewResp(dayProfitCurve, dayDateTime, CommonConstant.DATE_YMD, dayMap); getAnnualOverviewResp(dayProfitCurve, dayDateTime, CommonConstant.DATE_YMD, dayMap);
@ -1606,12 +1621,13 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
} }
} }
BigDecimal result = dischargeProfit.subtract(chargeProfit).divide(new BigDecimal("10000")); BigDecimal result = dischargeProfit.subtract(chargeProfit).divide(new BigDecimal("10000"));
if (result.doubleValue() > 0.0) { // if (result.doubleValue() > 0.0) {
annualChartValue.setProfit(result); // annualChartValue.setProfit(result);
} else { // } else {
log.info("{}，大屏计算收益,放电收益小于充电收益",day); // log.info("{}，大屏计算收益,放电收益小于充电收益",day);
annualChartValue.setProfit(BigDecimal.ZERO); // annualChartValue.setProfit(BigDecimal.ZERO);
} // }
annualChartValue.setProfit(result);
annualChartValue.setTime(day); annualChartValue.setTime(day);
curveResult.add(annualChartValue); curveResult.add(annualChartValue);
} }