Commit 426e1a34 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent eeb5c662
...@@ -583,23 +583,33 @@ public class HomePageService { ...@@ -583,23 +583,33 @@ public class HomePageService {
areaName = this.getSysAreaPath(context, plantViewList.get(0).getAreaCode()); areaName = this.getSysAreaPath(context, plantViewList.get(0).getAreaCode());
} }
//查平均产液量 //查平均产液量
BigDecimal cumulativeProduction;
if (CollUtil.isEmpty(wellheadList)) {
cumulativeProduction = BigDecimal.ZERO;
} else {
WellheadDailyProductionSituationMapper mapper = context.getBean(WellheadDailyProductionSituationMapper.class); WellheadDailyProductionSituationMapper mapper = context.getBean(WellheadDailyProductionSituationMapper.class);
BigDecimal cumulativeProduction = mapper.selectOne(new QueryWrapper<WellheadDailyProductionSituationEnt>() cumulativeProduction = mapper.selectOne(new QueryWrapper<WellheadDailyProductionSituationEnt>()
.select("IFNULL( AVG( daily_liquid_production ), 0 ) AS daily_liquid_production ") .select("IFNULL( AVG( daily_liquid_production ), 0 ) AS daily_liquid_production ")
.lambda() .lambda()
.in(WellheadDailyProductionSituationEnt::getWellNumber, wellheadList.stream() .in(WellheadDailyProductionSituationEnt::getWellNumber, wellheadList.stream()
.map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber) .map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber)
.collect(Collectors.toList())) .collect(Collectors.toList()))
).getDailyLiquidProduction(); ).getDailyLiquidProduction();
}
//查平均发电量 //查平均发电量
BigDecimal powerGeneration;
if (CollUtil.isEmpty(plantViewList)) {
powerGeneration = BigDecimal.ZERO;
} else {
EnergyConsumptionAnalysisMapper analysisMapper = context.getBean(EnergyConsumptionAnalysisMapper.class); EnergyConsumptionAnalysisMapper analysisMapper = context.getBean(EnergyConsumptionAnalysisMapper.class);
BigDecimal powerGeneration = analysisMapper.selectOne(new QueryWrapper<EnergyConsumptionAnalysisEnt>() powerGeneration = analysisMapper.selectOne(new QueryWrapper<EnergyConsumptionAnalysisEnt>()
.select("IFNULL( AVG( power_generation ), 0 ) AS power_generation ") .select("IFNULL( AVG( power_generation ), 0 ) AS power_generation ")
.lambda() .lambda()
.in(EnergyConsumptionAnalysisEnt::getStationName, plantViewList.stream() .in(EnergyConsumptionAnalysisEnt::getStationName, plantViewList.stream()
.map(DynamicQueryBasePowerLinePlantViewOutput::getStationName) .map(DynamicQueryBasePowerLinePlantViewOutput::getStationName)
.collect(Collectors.toList())) .collect(Collectors.toList()))
).getPowerGeneration(); ).getPowerGeneration();
}
return XSingleResult.success(GetLineViewOutput.builder() return XSingleResult.success(GetLineViewOutput.builder()
.wellList(wellheadList) .wellList(wellheadList)
.operatingLoad(operatingLoad) .operatingLoad(operatingLoad)
......
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