Skip to content

G
gf_back
Commit 486a0f60 authored by luoxiangyang's avatar luoxiangyang
Browse files
Options

井口配置表

parent fe76795d
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 545 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWellheadEnt.java
View file @ 486a0f60
...@@ -13,10 +13,10 @@ import java.util.Date; ...@@ -13,10 +13,10 @@ import java.util.Date;
@TableName("base_wellhead") @TableName("base_wellhead")
public class BaseWellheadEnt implements Serializable { public class BaseWellheadEnt implements Serializable {
@XText("ID") @XText("ID")
@TableId(type = IdType.AUTO) @TableId(type = IdType.ASSIGN_UUID)
private String id; private String id;
@XText("是否删除(0_是；1_否)") @XText("是否删除(1_是；0_否)")
@TableField @TableField
private Integer isDeleted; private Integer isDeleted;
...@@ -47,6 +47,9 @@ public class BaseWellheadEnt implements Serializable { ...@@ -47,6 +47,9 @@ public class BaseWellheadEnt implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
@XText("组织机构名称")
@TableField
private String ouName;
@XText("井号") @XText("井号")
@TableField @TableField
...@@ -56,6 +59,10 @@ public class BaseWellheadEnt implements Serializable { ...@@ -56,6 +59,10 @@ public class BaseWellheadEnt implements Serializable {
@TableField @TableField
private String runTypeKey; private String runTypeKey;
@XText("运行类型name(字典获取)")
@TableField
private String runTypeName;
@XText("运行功率(KW)") @XText("运行功率(KW)")
@TableField @TableField
private BigDecimal serviceRating; private BigDecimal serviceRating;
...@@ -156,4 +163,19 @@ public class BaseWellheadEnt implements Serializable { ...@@ -156,4 +163,19 @@ public class BaseWellheadEnt implements Serializable {
this.serviceRating = value; this.serviceRating = value;
} }
public String getOuName() {
return ouName;
}
public void setOuName(String ouName) {
this.ouName = ouName;
}
public String getRunTypeName() {
return runTypeName;
}
public void setRunTypeName(String runTypeName) {
this.runTypeName = runTypeName;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWellheadView.java
View file @ 486a0f60
...@@ -43,6 +43,9 @@ public class BaseWellheadView implements Serializable { ...@@ -43,6 +43,9 @@ public class BaseWellheadView implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
@XText("组织机构name")
@TableField
private String ouName;
@XText("井号") @XText("井号")
@TableField @TableField
...@@ -51,6 +54,9 @@ public class BaseWellheadView implements Serializable { ...@@ -51,6 +54,9 @@ public class BaseWellheadView implements Serializable {
@XText("运行类型key(字典获取)") @XText("运行类型key(字典获取)")
@TableField @TableField
private String runTypeKey; private String runTypeKey;
@XText("运行类型name(字典获取)")
@TableField
private String runTypeName;
@XText("运行功率(KW)") @XText("运行功率(KW)")
@TableField @TableField
...@@ -152,4 +158,19 @@ public class BaseWellheadView implements Serializable { ...@@ -152,4 +158,19 @@ public class BaseWellheadView implements Serializable {
this.serviceRating = value; this.serviceRating = value;
} }
public String getOuName() {
return ouName;
}
public void setOuName(String ouName) {
this.ouName = ouName;
}
public String getRunTypeName() {
return runTypeName;
}
public void setRunTypeName(String runTypeName) {
this.runTypeName = runTypeName;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWellheadService.java
View file @ 486a0f60
package pps.core.base.service; package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import pps.core.base.constant.ScadaConstant;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BaseWellheadEnt; import pps.core.base.entity.BaseWellheadEnt;
import pps.core.base.entity.BaseWellheadView;
import pps.core.base.mapper.BaseWellheadMapper; import pps.core.base.mapper.BaseWellheadMapper;
import pps.core.base.mapper.BaseWellheadViewMapper;
import pps.core.base.service.data.base_wellhead.*; import pps.core.base.service.data.base_wellhead.*;
import pps.core.base.utils.SessionSimulation;
import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult; import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
...@@ -21,20 +20,31 @@ import xstartup.feature.api.annotation.XApiGet; ...@@ -21,20 +20,31 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper; import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List; import java.util.Date;
@XService @XService
public class BaseWellheadService { public class BaseWellheadService {
private final PpsUserSession session = SessionSimulation.getSession();
@XText("新增")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult createBaseWellhead(XContext context, CreateBaseWellheadInput input) { public XServiceResult createBaseWellhead(XContext context, CreateBaseWellheadInput input) {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class); BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
BaseWellheadEnt entity = new BaseWellheadEnt(); BaseWellheadEnt entity = new BaseWellheadEnt();
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
//PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(new Date());
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(new Date());
mapper.insert(entity); mapper.insert(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("更新")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult updateBaseWellhead(XContext context, UpdateBaseWellheadInput input) { public XServiceResult updateBaseWellhead(XContext context, UpdateBaseWellheadInput input) {
...@@ -46,10 +56,15 @@ public class BaseWellheadService { ...@@ -46,10 +56,15 @@ public class BaseWellheadService {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
//PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(new Date());
mapper.updateById(entity); mapper.updateById(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("删除")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult deleteBaseWellhead(XContext context, DeleteBaseWellheadInput input) { public XServiceResult deleteBaseWellhead(XContext context, DeleteBaseWellheadInput input) {
...@@ -60,16 +75,21 @@ public class BaseWellheadService { ...@@ -60,16 +75,21 @@ public class BaseWellheadService {
if (entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
mapper.deleteById(entity); entity = new BaseWellheadEnt();
entity.setId(input.getId());
entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
mapper.updateById(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("根据ID获取详情")
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XSingleResult<GetBaseWellheadOutput> getBaseWellhead(XContext context, GetBaseWellheadInput input) { public XSingleResult<GetBaseWellheadOutput> getBaseWellhead(XContext context, GetBaseWellheadInput input) {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class); BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseWellheadEnt::getId, input.getId()); queryWrapper.lambda().eq(BaseWellheadEnt::getId, input.getId());
queryWrapper.lambda().eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
BaseWellheadEnt entity = mapper.selectOne(queryWrapper); BaseWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
...@@ -79,59 +99,16 @@ public class BaseWellheadService { ...@@ -79,59 +99,16 @@ public class BaseWellheadService {
return XSingleResult.success(output); return XSingleResult.success(output);
} }
@XText("分页查询")
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) { public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class); BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BaseWellheadEnt::getId, input.getId()) queryWrapper.lambda()
.eq(BaseWellheadEnt::getIsDeleted, input.getIsDeleted()) .eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
.like(BaseWellheadEnt::getCreateById, input.getCreateById()) .eq(BaseWellheadEnt::getOuId, input.getOuId())
.like(BaseWellheadEnt::getCreateByName, input.getCreateByName()) .orderByDesc(BaseWellheadEnt::getModifyTime);
.eq(BaseWellheadEnt::getCreateTime, input.getCreateTime())
.like(BaseWellheadEnt::getModifyById, input.getModifyById())
.like(BaseWellheadEnt::getModifyByName, input.getModifyByName())
.eq(BaseWellheadEnt::getModifyTime, input.getModifyTime())
.like(BaseWellheadEnt::getOuId, input.getOuId())
.like(BaseWellheadEnt::getWellNumber, input.getWellNumber())
.like(BaseWellheadEnt::getRunTypeKey, input.getRunTypeKey())
.eq(BaseWellheadEnt::getServiceRating, input.getServiceRating());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseWellheadOutput.class); return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseWellheadOutput.class);
} }
@XApiAnonymous
@XApiGet
public XPageResult<QueryBaseWellheadOutput> dynamicQueryBaseWellhead(XContext context, CustomQueryInput input) {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
return XMapperHelper.query(mapper, input, BaseWellheadEnt.class, QueryBaseWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBaseWellheadViewOutput> getBaseWellheadView(XContext context, GetBaseWellheadViewInput input) {
BaseWellheadViewMapper mapper = context.getBean(BaseWellheadViewMapper.class);
BaseWellheadView record = new BaseWellheadView();
XCopyUtils.copyObject(input, record);
BaseWellheadView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBaseWellheadViewOutput output = new GetBaseWellheadViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBaseWellheadViewOutput> queryBaseWellheadView(XContext context, QueryBaseWellheadViewInput input) {
BaseWellheadViewMapper mapper = context.getBean(BaseWellheadViewMapper.class);
BaseWellheadView record = new BaseWellheadView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BaseWellheadView> list = mapper.selectList(record);
PageInfo<BaseWellheadView> pageInfo = new PageInfo<>(list);
List<QueryBaseWellheadViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseWellheadViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/CreateBaseWellheadInput.java
View file @ 486a0f60
...@@ -5,105 +5,24 @@ import java.util.Date; ...@@ -5,105 +5,24 @@ import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
public class CreateBaseWellheadInput { public class CreateBaseWellheadInput {
@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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("井号") @XText("井号")
private String wellNumber; private String wellNumber;
@XText("运行类型key(字典获取)") @XText("运行类型key(字典获取)")
private String runTypeKey; private String runTypeKey;
@XText("运行类型name(字典获取)")
private String runTypeName;
@XText("运行功率(KW)") @XText("运行功率(KW)")
private BigDecimal serviceRating; private BigDecimal serviceRating;
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 getOuId() { public String getOuId() {
return this.ouId; return this.ouId;
...@@ -137,4 +56,19 @@ public class CreateBaseWellheadInput { ...@@ -137,4 +56,19 @@ public class CreateBaseWellheadInput {
this.serviceRating = value; this.serviceRating = value;
} }
public String getOuName() {
return ouName;
}
public void setOuName(String ouName) {
this.ouName = ouName;
}
public String getRunTypeName() {
return runTypeName;
}
public void setRunTypeName(String runTypeName) {
this.runTypeName = runTypeName;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/DeleteBaseWellheadInput.java
View file @ 486a0f60
package pps.core.base.service.data.base_wellhead; package pps.core.base.service.data.base_wellhead;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -8,39 +9,6 @@ public class DeleteBaseWellheadInput { ...@@ -8,39 +9,6 @@ public class DeleteBaseWellheadInput {
@XText("ID") @XText("ID")
private String 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 ouId;
@XText("井号")
private String wellNumber;
@XText("运行类型key(字典获取)")
private String runTypeKey;
@XText("运行功率(KW)")
private BigDecimal serviceRating;
public String getId() { public String getId() {
return this.id; return this.id;
} }
...@@ -49,92 +17,5 @@ public class DeleteBaseWellheadInput { ...@@ -49,92 +17,5 @@ public class DeleteBaseWellheadInput {
this.id = 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 getOuId() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getWellNumber() {
return this.wellNumber;
}
public void setWellNumber(String value) {
this.wellNumber = value;
}
public String getRunTypeKey() {
return this.runTypeKey;
}
public void setRunTypeKey(String value) {
this.runTypeKey = value;
}
public BigDecimal getServiceRating() {
return this.serviceRating;
}
public void setServiceRating(BigDecimal value) {
this.serviceRating = value;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/GetBaseWellheadInput.java
View file @ 486a0f60
package pps.core.base.service.data.base_wellhead; package pps.core.base.service.data.base_wellhead;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -8,39 +9,6 @@ public class GetBaseWellheadInput { ...@@ -8,39 +9,6 @@ public class GetBaseWellheadInput {
@XText("ID") @XText("ID")
private String 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 ouId;
@XText("井号")
private String wellNumber;
@XText("运行类型key(字典获取)")
private String runTypeKey;
@XText("运行功率(KW)")
private BigDecimal serviceRating;
public String getId() { public String getId() {
return this.id; return this.id;
} }
...@@ -49,92 +17,5 @@ public class GetBaseWellheadInput { ...@@ -49,92 +17,5 @@ public class GetBaseWellheadInput {
this.id = 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 getOuId() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getWellNumber() {
return this.wellNumber;
}
public void setWellNumber(String value) {
this.wellNumber = value;
}
public String getRunTypeKey() {
return this.runTypeKey;
}
public void setRunTypeKey(String value) {
this.runTypeKey = value;
}
public BigDecimal getServiceRating() {
return this.serviceRating;
}
public void setServiceRating(BigDecimal value) {
this.serviceRating = value;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/GetBaseWellheadOutput.java
View file @ 486a0f60
...@@ -31,12 +31,16 @@ public class GetBaseWellheadOutput { ...@@ -31,12 +31,16 @@ public class GetBaseWellheadOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("井号") @XText("井号")
private String wellNumber; private String wellNumber;
@XText("运行类型key(字典获取)") @XText("运行类型key(字典获取)")
private String runTypeKey; private String runTypeKey;
@XText("运行类型name(字典获取)")
private String runTypeName;
@XText("运行功率(KW)") @XText("运行功率(KW)")
private BigDecimal serviceRating; private BigDecimal serviceRating;
...@@ -137,4 +141,19 @@ public class GetBaseWellheadOutput { ...@@ -137,4 +141,19 @@ public class GetBaseWellheadOutput {
this.serviceRating = value; this.serviceRating = value;
} }
public String getOuName() {
return ouName;
}
public void setOuName(String ouName) {
this.ouName = ouName;
}
public String getRunTypeName() {
return runTypeName;
}
public void setRunTypeName(String runTypeName) {
this.runTypeName = runTypeName;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadInput.java
View file @ 486a0f60
...@@ -6,105 +6,24 @@ import java.math.BigDecimal; ...@@ -6,105 +6,24 @@ import java.math.BigDecimal;
import xstartup.base.data.XPageInput; import xstartup.base.data.XPageInput;
public class QueryBaseWellheadInput extends XPageInput { public class QueryBaseWellheadInput extends XPageInput {
@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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构ID")
private String ouName;
@XText("井号") @XText("井号")
private String wellNumber; private String wellNumber;
@XText("运行类型key(字典获取)") @XText("运行类型key(字典获取)")
private String runTypeKey; private String runTypeKey;
@XText("运行类型name(字典获取)")
private String runTypeName;
@XText("运行功率(KW)") @XText("运行功率(KW)")
private BigDecimal serviceRating; private BigDecimal serviceRating;
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 getOuId() { public String getOuId() {
return this.ouId; return this.ouId;
...@@ -138,4 +57,19 @@ public class QueryBaseWellheadInput extends XPageInput { ...@@ -138,4 +57,19 @@ public class QueryBaseWellheadInput extends XPageInput {
this.serviceRating = value; this.serviceRating = value;
} }
public String getOuName() {
return ouName;
}
public void setOuName(String ouName) {
this.ouName = ouName;
}
public String getRunTypeName() {
return runTypeName;
}
public void setRunTypeName(String runTypeName) {
this.runTypeName = runTypeName;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadOutput.java
View file @ 486a0f60
...@@ -9,7 +9,7 @@ public class QueryBaseWellheadOutput extends XPageInput { ...@@ -9,7 +9,7 @@ public class QueryBaseWellheadOutput extends XPageInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是；1_否)") @XText("是否删除(1_是；0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,12 +32,16 @@ public class QueryBaseWellheadOutput extends XPageInput { ...@@ -32,12 +32,16 @@ public class QueryBaseWellheadOutput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构名称")
private String ouName;
@XText("井号") @XText("井号")
private String wellNumber; private String wellNumber;
@XText("运行类型key(字典获取)") @XText("运行类型key(字典获取)")
private String runTypeKey; private String runTypeKey;
@XText("运行类型Name(字典获取)")
private String runTypeName;
@XText("运行功率(KW)") @XText("运行功率(KW)")
private BigDecimal serviceRating; private BigDecimal serviceRating;
...@@ -138,4 +142,19 @@ public class QueryBaseWellheadOutput extends XPageInput { ...@@ -138,4 +142,19 @@ public class QueryBaseWellheadOutput extends XPageInput {
this.serviceRating = value; this.serviceRating = value;
} }
public String getOuName() {
return ouName;
}
public void setOuName(String ouName) {
this.ouName = ouName;
}
public String getRunTypeName() {
return runTypeName;
}
public void setRunTypeName(String runTypeName) {
this.runTypeName = runTypeName;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/UpdateBaseWellheadInput.java
View file @ 486a0f60
...@@ -8,27 +8,6 @@ public class UpdateBaseWellheadInput { ...@@ -8,27 +8,6 @@ public class UpdateBaseWellheadInput {
@XText("ID") @XText("ID")
private String 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") @XText("组织机构ID")
private String ouId; private String ouId;
...@@ -49,62 +28,6 @@ public class UpdateBaseWellheadInput { ...@@ -49,62 +28,6 @@ public class UpdateBaseWellheadInput {
this.id = 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 getOuId() { public String getOuId() {
return this.ouId; return this.ouId;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/utils/SessionSimulation.java 0 → 100644
View file @ 486a0f60
package pps.core.base.utils;
import pps.core.common.session.PpsUserSession;
/**
* @Description 模拟
* @Author luoxiangyang
* @Date 2023/8/24 16:32
**/
public class SessionSimulation {
public static PpsUserSession getSession (){
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
return session;
}
}
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseWellheadViewMapper.xml
View file @ 486a0f60
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" />
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE" />
<result column="ou_id" property="ouId" jdbcType="VARCHAR" /> <result column="ou_id" property="ouId" jdbcType="VARCHAR" />
<result column="ou_name" property="ouName" jdbcType="VARCHAR" />
<result column="well_number" property="wellNumber" jdbcType="VARCHAR" /> <result column="well_number" property="wellNumber" jdbcType="VARCHAR" />
<result column="run_type_key" property="runTypeKey" jdbcType="VARCHAR" /> <result column="run_type_key" property="runTypeKey" jdbcType="VARCHAR" />
<result column="run_type_name" property="runTypeName" jdbcType="VARCHAR" />
<result column="service_rating" property="serviceRating" jdbcType="DECIMAL" /> <result column="service_rating" property="serviceRating" jdbcType="DECIMAL" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -25,8 +27,10 @@ ...@@ -25,8 +27,10 @@
modify_by_name, modify_by_name,
modify_time, modify_time,
ou_id, ou_id,
ou_name,
well_number, well_number,
run_type_key, run_type_key,
run_type_name,
service_rating service_rating
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseWellheadView" resultMap="BaseResultMap"> <select id="selectOne" parameterType="pps.core.base.entity.BaseWellheadView" resultMap="BaseResultMap">
......
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