Commit 7d1b72d0 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.长庆演示首页功能开发,新增采油厂统计信息查询接口,添加线上接口并完成接口冒烟测试;
2.长庆演示首页功能开发,新增线路图查询接口,添加线上接口并完成接口冒烟测试;
3.长庆演示首页功能开发,新增线路详情查询接口,添加线上接口并完成接口冒烟测试;
4.对接第三方接口,完成获取井场日累计数据接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
5.对接第三方接口,完成获取第三方单井平均有功功率接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c6946d61
......@@ -44,6 +44,7 @@ import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import java.math.BigDecimal;
......@@ -565,6 +566,7 @@ public class HomePageService {
* @param input 输入
* @return {@link XSingleResult}<{@link GetLineViewOutput}>
*/
@XApiAnonymous
@XText("首页模块--线路详情")
@XApiGet
public XSingleResult<GetLineViewOutput> getLineView(XContext context, GetLineViewInput input) {
......@@ -588,13 +590,17 @@ public class HomePageService {
cumulativeProduction = BigDecimal.ZERO;
} else {
WellheadDailyProductionSituationMapper mapper = context.getBean(WellheadDailyProductionSituationMapper.class);
cumulativeProduction = mapper.selectOne(new QueryWrapper<WellheadDailyProductionSituationEnt>()
.select("IFNULL( AVG( daily_liquid_production ), 0 ) AS daily_liquid_production ")
.lambda()
.in(WellheadDailyProductionSituationEnt::getWellNumber, wellheadList.stream()
.map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber)
.collect(Collectors.toList()))
).getDailyLiquidProduction().setScale(2, RoundingMode.HALF_UP);
cumulativeProduction = mapper.selectList(new QueryWrapper<WellheadDailyProductionSituationEnt>()
.select("IFNULL( AVG( daily_liquid_production ), 0 ) AS daily_liquid_production ")
.lambda()
.in(WellheadDailyProductionSituationEnt::getWellNumber, wellheadList.stream()
.map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber)
.collect(Collectors.toList()))
.groupBy(WellheadDailyProductionSituationEnt::getWellNumber)
).stream()
.map(WellheadDailyProductionSituationEnt::getDailyLiquidProduction)
.reduce(BigDecimal.ZERO, BigDecimal::add)
.setScale(2, RoundingMode.HALF_UP);
}
//查平均发电量
BigDecimal powerGeneration;
......@@ -602,13 +608,17 @@ public class HomePageService {
powerGeneration = BigDecimal.ZERO;
} else {
EnergyConsumptionAnalysisMapper analysisMapper = context.getBean(EnergyConsumptionAnalysisMapper.class);
powerGeneration = analysisMapper.selectOne(new QueryWrapper<EnergyConsumptionAnalysisEnt>()
.select("IFNULL( AVG( power_generation ), 0 ) AS power_generation ")
.lambda()
.in(EnergyConsumptionAnalysisEnt::getStationName, plantViewList.stream()
.map(DynamicQueryBasePowerLinePlantViewOutput::getStationName)
.collect(Collectors.toList()))
).getPowerGeneration().setScale(2, RoundingMode.HALF_UP);
powerGeneration = analysisMapper.selectList(new QueryWrapper<EnergyConsumptionAnalysisEnt>()
.select("IFNULL( AVG( power_generation ), 0 ) AS power_generation ")
.lambda()
.in(EnergyConsumptionAnalysisEnt::getStationName, plantViewList.stream()
.map(DynamicQueryBasePowerLinePlantViewOutput::getStationName)
.collect(Collectors.toList()))
.groupBy(EnergyConsumptionAnalysisEnt::getStationName)
).stream()
.map(EnergyConsumptionAnalysisEnt::getPowerGeneration)
.reduce(BigDecimal.ZERO, BigDecimal::add)
.setScale(2, RoundingMode.HALF_UP);
}
return XSingleResult.success(GetLineViewOutput.builder()
.wellList(wellheadList)
......
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