Commit 44d056b2 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.长庆演示首页功能开发,新增查询井场/场站列表接口,添加接口文档并完成接口冒烟测试;
2.长庆演示首页功能开发,新增总览信息统计接口,添加接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 47dc5ed2
package pps.core.prediction.service; package pps.core.prediction.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.IBasePowerLineCloudService; import pps.cloud.base.service.IBasePowerLineCloudService;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput; import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
...@@ -12,7 +13,6 @@ import pps.core.prediction.service.data.third_current_well_condition.QueryThirdC ...@@ -12,7 +13,6 @@ import pps.core.prediction.service.data.third_current_well_condition.QueryThirdC
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult; import xstartup.data.XListResult;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
...@@ -60,6 +60,18 @@ public class ThirdCurrentWellConditionService { ...@@ -60,6 +60,18 @@ public class ThirdCurrentWellConditionService {
.map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber) .map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber)
.collect(Collectors.toList())) .collect(Collectors.toList()))
); );
return XListResult.success(XCopyUtils.copyNewList(selectList, QueryThirdCurrentWellConditionOutput.class)); List<QueryThirdCurrentWellConditionOutput> outputList = new ArrayList<>(selectList.size());
for (ThirdCurrentWellConditionEnt ent : selectList) {
outputList.add(
QueryThirdCurrentWellConditionOutput.builder()
.wellNumber(ent.getWellNumber())
.nextTime(CharSequenceUtil.equals(ent.getWellStatus(), "开井") ? ent.getNextTime() : null)
.wellStatus(ent.getWellStatus())
.cumulativeProduction(ent.getCumulativeProduction())
.runningTime(ent.getRunningTime())
.build()
);
}
return XListResult.success(outputList);
} }
} }
package pps.core.prediction.service.data.third_current_well_condition; package pps.core.prediction.service.data.third_current_well_condition;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -13,6 +16,9 @@ import java.util.Date; ...@@ -13,6 +16,9 @@ import java.util.Date;
* @date 2024/03/19 * @date 2024/03/19
*/ */
@Data @Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class QueryThirdCurrentWellConditionOutput { public class QueryThirdCurrentWellConditionOutput {
@XText("ID") @XText("ID")
private Long id; private Long id;
...@@ -30,7 +36,7 @@ public class QueryThirdCurrentWellConditionOutput { ...@@ -30,7 +36,7 @@ public class QueryThirdCurrentWellConditionOutput {
private BigDecimal cumulativeProduction; private BigDecimal cumulativeProduction;
@XText("开井时长(h)") @XText("开井时长(h)")
private Integer runningTime; private BigDecimal runningTime;
@XText("来源系统") @XText("来源系统")
private String systemSource; private String systemSource;
......
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