Skip to content

G
gf_back
Commit ac1c5aec authored by tianchao's avatar tianchao
Browse files
Options

Merge branch 'master' of https://gitlab.sunboxauto.com/tianchao/gf_back

parents 46df6b5f 77105a08
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 926 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortDurationView.java
View file @ ac1c5aec
package pps.core.space.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText;
......@@ -14,6 +17,9 @@ import java.io.Serializable;
* @date 2023/09/05
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class SpaceOptimizeShortDurationView extends BaseModel implements Serializable {
@XText("井口记录ID")
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortWellheadView.java
View file @ ac1c5aec
package pps.core.space.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText;
......@@ -14,6 +17,9 @@ import java.io.Serializable;
* @date 2023/09/05
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class SpaceOptimizeShortWellheadView extends BaseModel implements Serializable {
@XText("短期优化周期ID")
......
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortDurationMapper.java
View file @ ac1c5aec
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
/**
* 短期间开优化井口制度记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortDurationMapper")
public interface SpaceOptimizeShortDurationMapper extends BaseMapper<SpaceOptimizeShortDurationEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortDurationViewMapper.java
View file @ ac1c5aec
......@@ -5,9 +5,21 @@ import pps.core.space.entity.SpaceOptimizeShortDurationView;
import java.util.List;
/**
* 短期间开优化井口制度记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper")
public interface SpaceOptimizeShortDurationViewMapper {
SpaceOptimizeShortDurationView selectOne(SpaceOptimizeShortDurationView record);
/**
* 查询井口列表已优化后为准
*
* @param record 记录
* @return {@link List}<{@link SpaceOptimizeShortDurationView}>
*/
List<SpaceOptimizeShortDurationView> selectList(SpaceOptimizeShortDurationView record);
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortPeriodMapper.java
View file @ ac1c5aec
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortPeriodEnt;
/**
* 短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortPeriodMapper")
public interface SpaceOptimizeShortPeriodMapper extends BaseMapper<SpaceOptimizeShortPeriodEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortPeriodViewMapper.java
View file @ ac1c5aec
......@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceOptimizeShortPeriodView;
import java.util.List;
/**
* 短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortPeriodViewMapper")
public interface SpaceOptimizeShortPeriodViewMapper {
SpaceOptimizeShortPeriodView selectOne(SpaceOptimizeShortPeriodView record);
......
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortWellheadMapper.java
View file @ ac1c5aec
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
/**
* 短期间开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortWellheadMapper")
public interface SpaceOptimizeShortWellheadMapper extends BaseMapper<SpaceOptimizeShortWellheadEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortWellheadViewMapper.java
View file @ ac1c5aec
......@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceOptimizeShortWellheadView;
import java.util.List;
/**
* 短期间开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortWellheadViewMapper")
public interface SpaceOptimizeShortWellheadViewMapper {
SpaceOptimizeShortWellheadView selectOne(SpaceOptimizeShortWellheadView record);
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortDurationService.java deleted 100644 → 0
View file @ 46df6b5f
package pps.core.space.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
import pps.core.space.entity.SpaceOptimizeShortDurationView;
import pps.core.space.mapper.SpaceOptimizeShortDurationMapper;
import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
import pps.core.space.service.data.space_optimize_short_duration.*;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List;
@XService
public class SpaceOptimizeShortDurationService {
@XApiAnonymous
@XApiPost
public XServiceResult createSpaceOptimizeShortDuration(XContext context, CreateSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
SpaceOptimizeShortDurationEnt entity = new SpaceOptimizeShortDurationEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateSpaceOptimizeShortDuration(XContext context, UpdateSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDurationEnt::getId, input.getId());
SpaceOptimizeShortDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
mapper.updateById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult deleteSpaceOptimizeShortDuration(XContext context, DeleteSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDurationEnt::getId, input.getId());
SpaceOptimizeShortDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortDurationOutput> getSpaceOptimizeShortDuration(XContext context, GetSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDurationEnt::getId, input.getId());
SpaceOptimizeShortDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortDurationOutput output = new GetSpaceOptimizeShortDurationOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationOutput> querySpaceOptimizeShortDuration(XContext context, QuerySpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortDurationEnt::getId, input.getId())
.eq(SpaceOptimizeShortDurationEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortDurationEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortDurationEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortDurationEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortDurationEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortDurationEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortDurationEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortDurationEnt::getRecordId, input.getRecordId())
.like(SpaceOptimizeShortDurationEnt::getShortPeriodId, input.getShortPeriodId())
.like(SpaceOptimizeShortDurationEnt::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeShortDurationEnt::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeShortDurationEnt::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeShortDurationEnt::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeShortDurationEnt::getCloseWellTime, input.getCloseWellTime());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeShortDurationOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationOutput> dynamicQuerySpaceOptimizeShortDuration(XContext context, CustomQueryInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortDurationEnt.class, QuerySpaceOptimizeShortDurationOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortDurationViewOutput> getSpaceOptimizeShortDurationView(XContext context, GetSpaceOptimizeShortDurationViewInput input) {
SpaceOptimizeShortDurationViewMapper mapper = context.getBean(SpaceOptimizeShortDurationViewMapper.class);
SpaceOptimizeShortDurationView record = new SpaceOptimizeShortDurationView();
XCopyUtils.copyObject(input, record);
SpaceOptimizeShortDurationView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortDurationViewOutput output = new GetSpaceOptimizeShortDurationViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationViewOutput> querySpaceOptimizeShortDurationView(XContext context, QuerySpaceOptimizeShortDurationViewInput input) {
SpaceOptimizeShortDurationViewMapper mapper = context.getBean(SpaceOptimizeShortDurationViewMapper.class);
SpaceOptimizeShortDurationView record = new SpaceOptimizeShortDurationView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<SpaceOptimizeShortDurationView> list = mapper.selectList(record);
PageInfo<SpaceOptimizeShortDurationView> pageInfo = new PageInfo<>(list);
List<QuerySpaceOptimizeShortDurationViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceOptimizeShortDurationViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortWellheadService.java deleted 100644 → 0
View file @ 46df6b5f
package pps.core.space.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
import pps.core.space.entity.SpaceOptimizeShortWellheadView;
import pps.core.space.mapper.SpaceOptimizeShortWellheadMapper;
import pps.core.space.mapper.SpaceOptimizeShortWellheadViewMapper;
import pps.core.space.service.data.space_optimize_short_wellhead.*;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List;
@XService
public class SpaceOptimizeShortWellheadService {
@XApiAnonymous
@XApiPost
public XServiceResult createSpaceOptimizeShortWellhead(XContext context, CreateSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
SpaceOptimizeShortWellheadEnt entity = new SpaceOptimizeShortWellheadEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateSpaceOptimizeShortWellhead(XContext context, UpdateSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellheadEnt::getId, input.getId());
SpaceOptimizeShortWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
mapper.updateById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult deleteSpaceOptimizeShortWellhead(XContext context, DeleteSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellheadEnt::getId, input.getId());
SpaceOptimizeShortWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortWellheadOutput> getSpaceOptimizeShortWellhead(XContext context, GetSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellheadEnt::getId, input.getId());
SpaceOptimizeShortWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortWellheadOutput output = new GetSpaceOptimizeShortWellheadOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadOutput> querySpaceOptimizeShortWellhead(XContext context, QuerySpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortWellheadEnt::getId, input.getId())
.eq(SpaceOptimizeShortWellheadEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortWellheadEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortWellheadEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortWellheadEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortWellheadEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortWellheadEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortWellheadEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortWellheadEnt::getShortPeriodId, input.getShortPeriodId())
.like(SpaceOptimizeShortWellheadEnt::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeShortWellheadEnt::getWellNumber, input.getWellNumber());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeShortWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadOutput> dynamicQuerySpaceOptimizeShortWellhead(XContext context, CustomQueryInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortWellheadEnt.class, QuerySpaceOptimizeShortWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortWellheadViewOutput> getSpaceOptimizeShortWellheadView(XContext context, GetSpaceOptimizeShortWellheadViewInput input) {
SpaceOptimizeShortWellheadViewMapper mapper = context.getBean(SpaceOptimizeShortWellheadViewMapper.class);
SpaceOptimizeShortWellheadView record = new SpaceOptimizeShortWellheadView();
XCopyUtils.copyObject(input, record);
SpaceOptimizeShortWellheadView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortWellheadViewOutput output = new GetSpaceOptimizeShortWellheadViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadViewOutput> querySpaceOptimizeShortWellheadView(XContext context, QuerySpaceOptimizeShortWellheadViewInput input) {
SpaceOptimizeShortWellheadViewMapper mapper = context.getBean(SpaceOptimizeShortWellheadViewMapper.class);
SpaceOptimizeShortWellheadView record = new SpaceOptimizeShortWellheadView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<SpaceOptimizeShortWellheadView> list = mapper.selectList(record);
PageInfo<SpaceOptimizeShortWellheadView> pageInfo = new PageInfo<>(list);
List<QuerySpaceOptimizeShortWellheadViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceOptimizeShortWellheadViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_duration/GetSpaceOptimizeShortDurationOutput.java
View file @ ac1c5aec
package pps.core.space.service.data.space_optimize_short_duration;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 井口时段配置
*
* @author ZWT
* @date 2023/09/08
*/
@Data
public class GetSpaceOptimizeShortDurationOutput {
@XText("ID")
private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("井口记录ID")
private String recordId;
@XText("短期优化周期ID")
private String shortPeriodId;
@XText("井口ID")
private String wellheadId;
......@@ -49,125 +26,4 @@ public class GetSpaceOptimizeShortDurationOutput {
@XText("关井时间")
private String closeWellTime;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public Integer getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(Integer value) {
this.isDeleted = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
public String getRecordId() {
return this.recordId;
}
public void setRecordId(String value) {
this.recordId = value;
}
public String getShortPeriodId() {
return this.shortPeriodId;
}
public void setShortPeriodId(String value) {
this.shortPeriodId = value;
}
public String getWellheadId() {
return this.wellheadId;
}
public void setWellheadId(String value) {
this.wellheadId = value;
}
public Integer getIsOptimize() {
return this.isOptimize;
}
public void setIsOptimize(Integer value) {
this.isOptimize = value;
}
public String getGenerationTypeKey() {
return this.generationTypeKey;
}
public void setGenerationTypeKey(String value) {
this.generationTypeKey = value;
}
public String getOpenWellTime() {
return this.openWellTime;
}
public void setOpenWellTime(String value) {
this.openWellTime = value;
}
public String getCloseWellTime() {
return this.closeWellTime;
}
public void setCloseWellTime(String value) {
this.closeWellTime = value;
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/GetSpaceOptimizeShortPeriodViewInput.java
View file @ ac1c5aec
package pps.core.space.service.data.space_optimize_short_period;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeShortPeriodViewInput {
@XText("ID")
private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("线路ID")
@NotBlank(message = "缺少线路ID")
private String lineId;
@XText("间开制度ID")
private String institutionId;
@XText("优化状态(0_已优化;1_未优化)")
private Integer optimizeState;
@XText("优化日期")
private Date optimizeDate;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public Integer getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(Integer value) {
this.isDeleted = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
public String getLineId() {
return this.lineId;
}
public void setLineId(String value) {
this.lineId = value;
}
public String getInstitutionId() {
return this.institutionId;
}
public void setInstitutionId(String value) {
this.institutionId = value;
}
public Integer getOptimizeState() {
return this.optimizeState;
}
public void setOptimizeState(Integer value) {
this.optimizeState = value;
}
public Date getOptimizeDate() {
return this.optimizeDate;
}
public void setOptimizeDate(Date value) {
this.optimizeDate = value;
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/GetSpaceOptimizeShortPeriodViewOutput.java
View file @ ac1c5aec
package pps.core.space.service.data.space_optimize_short_period;
import lombok.Data;
import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadViewOutput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
* 短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeShortPeriodViewOutput {
@XText("ID")
private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("线路ID")
private String lineId;
@XText("间开制度ID")
private String institutionId;
@XText("优化状态(0_已优化;1_未优化)")
private Integer optimizeState;
@XText("优化日期")
private Date optimizeDate;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public Integer getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(Integer value) {
this.isDeleted = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
public String getLineId() {
return this.lineId;
}
public void setLineId(String value) {
this.lineId = value;
}
public String getInstitutionId() {
return this.institutionId;
}
public void setInstitutionId(String value) {
this.institutionId = value;
}
public Integer getOptimizeState() {
return this.optimizeState;
}
public void setOptimizeState(Integer value) {
this.optimizeState = value;
}
public Date getOptimizeDate() {
return this.optimizeDate;
}
public void setOptimizeDate(Date value) {
this.optimizeDate = value;
}
/**
* 井口列表
*/
@XText("井口列表")
private List<GetSpaceOptimizeShortWellheadViewOutput> wellheadList;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_wellhead/GetSpaceOptimizeShortWellheadViewOutput.java
View file @ ac1c5aec
package pps.core.space.service.data.space_optimize_short_wellhead;
import lombok.Data;
import pps.core.space.service.data.space_optimize_short_duration.GetSpaceOptimizeShortDurationOutput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
* 短期间开优化井口记录
*
* @author ZWT
* @date 2023/09/08
*/
@Data
public class GetSpaceOptimizeShortWellheadViewOutput {
@XText("ID")
private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("短期优化周期ID")
private String shortPeriodId;
@XText("井口ID")
private String wellheadId;
......@@ -38,92 +21,9 @@ public class GetSpaceOptimizeShortWellheadViewOutput {
@XText("井号")
private String wellNumber;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public Integer getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(Integer value) {
this.isDeleted = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
public String getShortPeriodId() {
return this.shortPeriodId;
}
public void setShortPeriodId(String value) {
this.shortPeriodId = value;
}
public String getWellheadId() {
return this.wellheadId;
}
public void setWellheadId(String value) {
this.wellheadId = value;
}
public String getWellNumber() {
return this.wellNumber;
}
public void setWellNumber(String value) {
this.wellNumber = value;
}
/**
* 井口时段配置
*/
@XText("井口时段配置")
private List<GetSpaceOptimizeShortDurationOutput> durationList;
}
C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceOptimizeShortDurationViewMapper.xml
View file @ ac1c5aec
......@@ -44,12 +44,27 @@
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.space.entity.SpaceOptimizeShortDurationView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from space_optimize_short_duration
where
id=#{id}
WITH opt_short AS (SELECT wellhead_id, is_optimize, open_well_time, close_well_time, generation_type_key
FROM space_optimize_short_duration
WHERE is_optimize = 0
AND short_period_id = #{shortPeriodId})
SELECT *
FROM (SELECT wellhead_id,
is_optimize,
open_well_time,
close_well_time,
generation_type_key
FROM space_optimize_short_duration
WHERE is_optimize = 1
AND short_period_id = #{shortPeriodId}
AND wellhead_id NOT IN (SELECT wellhead_id FROM opt_short)
UNION ALL
SELECT *
FROM opt_short) d
ORDER BY d.wellhead_id,
d.open_well_time
</select>
</mapper>
\ No newline at end of file
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