Commit 5065ffcc authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e5d4eaa3
...@@ -424,7 +424,7 @@ public class HomePageService { ...@@ -424,7 +424,7 @@ public class HomePageService {
* @return {@link XSingleResult}<{@link GetIncomeAnalysisOutput}> * @return {@link XSingleResult}<{@link GetIncomeAnalysisOutput}>
*/ */
@XText("首页模块--收益分析") @XText("首页模块--收益分析")
@XApiGet @XApiGet(anonymous = true)
public XSingleResult<GetIncomeAnalysisOutput> getIncomeAnalysis(XContext context, GetStationViewInput input) { public XSingleResult<GetIncomeAnalysisOutput> getIncomeAnalysis(XContext context, GetStationViewInput input) {
String stationId = input.getStationId(); String stationId = input.getStationId();
boolean isOffGrid = false; boolean isOffGrid = false;
...@@ -475,11 +475,13 @@ public class HomePageService { ...@@ -475,11 +475,13 @@ public class HomePageService {
.subtract(analysisEnt.getPhotovoltaicPower() .subtract(analysisEnt.getPhotovoltaicPower()
.multiply(BigDecimal.valueOf(0.28))) .multiply(BigDecimal.valueOf(0.28)))
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP); .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
//近零碳井场绿电占比:(100-(累计就地消纳量/累计井场用电量*100%))*0.35 //近零碳井场绿电占比:(累计就地消纳量/累计井场用电量*100%)+(100-(累计就地消纳量/累计井场用电量*100%))*0.35
greenElectricityRate = BusinessConstant.BIG_DECIMAL_100.subtract(analysisEnt.getInPlaceConsumption() BigDecimal rate = analysisEnt.getInPlaceConsumption()
.multiply(BusinessConstant.BIG_DECIMAL_100) .multiply(BusinessConstant.BIG_DECIMAL_100)
.divide(analysisEnt.getDailyElectricityConsumption(), 6, RoundingMode.HALF_UP) .divide(analysisEnt.getDailyElectricityConsumption(), 2, RoundingMode.HALF_UP);
).multiply(BusinessConstant.BIG_DECIMAL_0_35).setScale(2, RoundingMode.HALF_UP) greenElectricityRate = rate.add(BusinessConstant.BIG_DECIMAL_100.subtract(rate)
.multiply(BusinessConstant.BIG_DECIMAL_0_35)
.setScale(2, RoundingMode.HALF_UP))
.toString(); .toString();
//零碳井场绿电占比:有离网线路的默认100% //零碳井场绿电占比:有离网线路的默认100%
zeroGreenElectricityRate = isOffGrid || ObjectUtil.isEmpty(stationId) ? zeroGreenElectricityRate : "-"; zeroGreenElectricityRate = isOffGrid || ObjectUtil.isEmpty(stationId) ? zeroGreenElectricityRate : "-";
......
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