Commit 03ca0ba9 authored by ZWT's avatar ZWT

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

1.能耗分析模块功能重构,新增今日/昨日/同期电量统计查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
2.能耗分析模块功能重构,新增今日天气查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
3.能耗分析模块功能重构,新增井场用能分析查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
4.能耗分析模块功能重构,新增井场发电趋势查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
5.能耗分析模块功能重构,新增井场实时监控查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
6.能耗分析模块功能重构,新增本日用电对比查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
7.能耗分析模块功能重构,新增发电详情查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
8.能耗分析模块功能重构,新增用电趋势查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
9.能耗分析模块功能重构,新增用电分析查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
10.间开配置Cloud模块添加查询生效中间开井口列表接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent dc71decc
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
<artifactId>pps-cloud-system</artifactId> <artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
</dependency> </dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -20,6 +20,9 @@ import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowe ...@@ -20,6 +20,9 @@ import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowe
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput; import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.cloud.space.service.ISpaceInstitutionDetailCloudService;
import pps.cloud.space.service.data.space_institution_wellhead.GetSpaceInstitutionWellheadInput;
import pps.cloud.space.service.data.space_institution_wellhead.GetSpaceInstitutionWellheadOutput;
import pps.cloud.system.service.SysOrganizationCloudService; import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput; import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput; import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
...@@ -404,7 +407,7 @@ public class EnergyConsumptionAnalysisService { ...@@ -404,7 +407,7 @@ public class EnergyConsumptionAnalysisService {
* @return {@link XSingleResult }<{@link GetWellFieldSituationOutput }> * @return {@link XSingleResult }<{@link GetWellFieldSituationOutput }>
*/ */
@XText("井场实时分析--井场实时监控") @XText("井场实时分析--井场实时监控")
@XApiGet(anonymous = true) @XApiGet
public XSingleResult<GetWellFieldSituationOutput> wellFieldSituation(XContext context, GetEnergyConsumptionAnalysisInput input) { public XSingleResult<GetWellFieldSituationOutput> wellFieldSituation(XContext context, GetEnergyConsumptionAnalysisInput input) {
int sumWellNumber = 0; int sumWellNumber = 0;
int normallyOpenWellNumber = 0; int normallyOpenWellNumber = 0;
...@@ -430,6 +433,20 @@ public class EnergyConsumptionAnalysisService { ...@@ -430,6 +433,20 @@ public class EnergyConsumptionAnalysisService {
.in(ThirdCurrentWellConditionEnt::getWellNumber, set) .in(ThirdCurrentWellConditionEnt::getWellNumber, set)
); );
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
//查生效中的所有井口
ISpaceInstitutionDetailCloudService service = context.getBean(ISpaceInstitutionDetailCloudService.class);
XListResult<GetSpaceInstitutionWellheadOutput> result = service.getInstitutionWellheadList(context, new GetSpaceInstitutionWellheadInput());
result.throwIfFail();
List<GetSpaceInstitutionWellheadOutput> wellheadOutputList = result.getResult();
Map<String, BigDecimal> collect;
if (CollUtil.isNotEmpty(wellheadOutputList)) {
collect = wellheadOutputList.stream()
.collect(Collectors.toMap(GetSpaceInstitutionWellheadOutput::getWellNumber,
GetSpaceInstitutionWellheadOutput::getRunDuration));
} else {
collect = Collections.emptyMap();
}
BigDecimal surplusTime;
currentList = new ArrayList<>(list.size()); currentList = new ArrayList<>(list.size());
for (ThirdCurrentWellConditionEnt ent : list) { for (ThirdCurrentWellConditionEnt ent : list) {
if (CharSequenceUtil.equals(ent.getWellStatus(), "开井")) { if (CharSequenceUtil.equals(ent.getWellStatus(), "开井")) {
...@@ -441,6 +458,11 @@ public class EnergyConsumptionAnalysisService { ...@@ -441,6 +458,11 @@ public class EnergyConsumptionAnalysisService {
if (ObjectUtil.isNotNull(nextTime) && CharSequenceUtil.contains(DateUtil.date(ent.getNextTime()).toString(), ThirdPartyApiConstant.DATE_FLAG)) { if (ObjectUtil.isNotNull(nextTime) && CharSequenceUtil.contains(DateUtil.date(ent.getNextTime()).toString(), ThirdPartyApiConstant.DATE_FLAG)) {
nextTime = null; nextTime = null;
} }
if (collect.containsKey(ent.getWellNumber())) {
surplusTime = collect.get(ent.getWellNumber()).subtract(ent.getRunningTime());
} else {
surplusTime = BigDecimal.ZERO;
}
currentList.add( currentList.add(
GetThirdCurrentWellConditionOutput.builder() GetThirdCurrentWellConditionOutput.builder()
.wellNumber(ent.getWellNumber()) .wellNumber(ent.getWellNumber())
...@@ -448,7 +470,7 @@ public class EnergyConsumptionAnalysisService { ...@@ -448,7 +470,7 @@ public class EnergyConsumptionAnalysisService {
.wellStatus(ent.getWellStatus()) .wellStatus(ent.getWellStatus())
.cumulativeProduction(ent.getCumulativeProduction()) .cumulativeProduction(ent.getCumulativeProduction())
.runningTime(ent.getRunningTime()) .runningTime(ent.getRunningTime())
.surplusTime(BigDecimal.ZERO) .surplusTime(surplusTime)
.build() .build()
); );
} }
......
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