Commit d439e60a authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 43f31bc3
......@@ -619,15 +619,15 @@ public class EnergyConsumptionAnalysisService {
/*------------------------------ 间开效果评价 ------------------------------*/
/**
* 本月累计节电经济效益
* 本月累计节电经济效益/减碳量
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult }<{@link GetEconomicBenefitsOutput }>
*/
@XText("间开效果评价--本月累计节电经济效益")
@XText("间开效果评价--本月累计节电经济效益/减碳量")
@XApiGet
public XListResult<GetEconomicBenefitsOutput> economicBenefits(XContext context, GetEnergyConsumptionAnalysisInput input) {
public XListResult<GetEconomicBenefitsOutput> economicBenefitCarbonReduction(XContext context, GetEnergyConsumptionAnalysisInput input) {
DynamicQueryBasePowerLinePlantInput plantInput = new DynamicQueryBasePowerLinePlantInput();
String stationName = input.getStationName();
if (CharSequenceUtil.isNotBlank(stationName)) {
......@@ -652,15 +652,19 @@ public class EnergyConsumptionAnalysisService {
//封装数据
List<GetEconomicBenefitsOutput> outputs = new ArrayList<>(rangeToList.size());
for (DateTime dateTime : rangeToList) {
BigDecimal economicBenefits;
BigDecimal economicBenefit;
BigDecimal carbonReduction;
if (map.containsKey(dateTime)) {
economicBenefits = this.calculateEconomicBenefits(map.get(dateTime));
economicBenefit = this.calculateEconomicBenefit(map.get(dateTime));
carbonReduction = this.calculateCarbonReduction(map.get(dateTime));
} else {
economicBenefits = BigDecimal.ZERO;
economicBenefit = BigDecimal.ZERO;
carbonReduction = BigDecimal.ZERO;
}
outputs.add(GetEconomicBenefitsOutput.builder()
.dateFormat(dateTime)
.economicBenefits(economicBenefits)
.economicBenefit(economicBenefit)
.carbonReduction(carbonReduction)
.build());
}
return XListResult.success(outputs);
......@@ -1151,17 +1155,35 @@ public class EnergyConsumptionAnalysisService {
* @param photovoltaicPower 光伏发电
* @return {@link BigDecimal }
*/
private BigDecimal calculateEconomicBenefits(BigDecimal photovoltaicPower) {
BigDecimal economicBenefits;
private BigDecimal calculateEconomicBenefit(BigDecimal photovoltaicPower) {
BigDecimal economicBenefit;
if (photovoltaicPower.compareTo(BigDecimal.ZERO) > 0) {
economicBenefits = photovoltaicPower
economicBenefit = photovoltaicPower
.multiply(BigDecimal.valueOf(0.6))
.subtract(photovoltaicPower
.multiply(BigDecimal.valueOf(0.28)))
.setScale(2, RoundingMode.HALF_UP);
} else {
economicBenefits = BigDecimal.ZERO;
economicBenefit = BigDecimal.ZERO;
}
return economicBenefits;
return economicBenefit;
}
/**
* 计算累计减碳量
*
* @param photovoltaicPower 光伏发电
* @return {@link BigDecimal }
*/
private BigDecimal calculateCarbonReduction(BigDecimal photovoltaicPower) {
BigDecimal carbonReduction;
if (photovoltaicPower.compareTo(BigDecimal.ZERO) > 0) {
carbonReduction = photovoltaicPower
.multiply(BusinessConstant.BIG_DECIMAL_6_67)
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
} else {
carbonReduction = BigDecimal.ZERO;
}
return carbonReduction;
}
}
......@@ -25,5 +25,8 @@ public class GetEconomicBenefitsOutput {
private Date dateFormat;
@XText("经济效益(元)")
private BigDecimal economicBenefits;
private BigDecimal economicBenefit;
@XText("减碳量(吨)")
private BigDecimal carbonReduction;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment