Commit dfa606cb authored by ZWT's avatar ZWT

feat(能源管理系统): 间开制度管理

1.间开制度管理-基础间开配置模块新增功能,完成接口冒烟测试并生成接口文档;
2.排查无法获取mapper对象导致空指针异常问题,space模块添加mapper配置类;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d307180e
...@@ -92,8 +92,17 @@ public class SpaceInstitutionDetailService { ...@@ -92,8 +92,17 @@ public class SpaceInstitutionDetailService {
}); });
} }
/**
* 基础间开配置--修改
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
@XText("基础间开配置--修改")
public XServiceResult updateSpaceInstitutionDetail(XContext context, UpdateSpaceInstitutionDetailInput input) { public XServiceResult updateSpaceInstitutionDetail(XContext context, UpdateSpaceInstitutionDetailInput input) {
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class); SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
QueryWrapper<SpaceInstitutionDetailEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<SpaceInstitutionDetailEnt> queryWrapper = new QueryWrapper<>();
...@@ -197,4 +206,9 @@ public class SpaceInstitutionDetailService { ...@@ -197,4 +206,9 @@ public class SpaceInstitutionDetailService {
return XPageResult.success(outputs, input, pageInfo.getTotal()); return XPageResult.success(outputs, input, pageInfo.getTotal());
} }
/*-----------------------------------private-----------------------------------*/
private void saveInstitutionWellhead(PpsUserSession session) {
}
} }
package pps.core.space.service.data.space_institution_detail; package pps.core.space.service.data.space_institution_detail;
import lombok.Data;
import pps.core.space.service.data.space_institution_wellhead.UpdateSpaceInstitutionWellheadInput;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.util.List;
/**
* 基础间开配置
*
* @author ZWT
* @date 2023/09/05
*/
@Data
public class UpdateSpaceInstitutionDetailInput { public class UpdateSpaceInstitutionDetailInput {
@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;
...@@ -59,148 +49,9 @@ public class UpdateSpaceInstitutionDetailInput { ...@@ -59,148 +49,9 @@ public class UpdateSpaceInstitutionDetailInput {
@XText("启动间隔(分钟)") @XText("启动间隔(分钟)")
private Integer startInterval; private Integer startInterval;
public String getId() { /**
return this.id; * 间开制度井口配置
} */
@XText("间开制度井口配置")
public void setId(String value) { List<UpdateSpaceInstitutionWellheadInput> wellheadList;
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 getLineId() {
return this.lineId;
}
public void setLineId(String value) {
this.lineId = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getInstitutionName() {
return this.institutionName;
}
public void setInstitutionName(String value) {
this.institutionName = value;
}
public Date getInstitutionStartDate() {
return this.institutionStartDate;
}
public void setInstitutionStartDate(Date value) {
this.institutionStartDate = value;
}
public Date getInstitutionEndDate() {
return this.institutionEndDate;
}
public void setInstitutionEndDate(Date value) {
this.institutionEndDate = value;
}
public Date getOptimizeDeadline() {
return this.optimizeDeadline;
}
public void setOptimizeDeadline(Date value) {
this.optimizeDeadline = value;
}
public Integer getOptimizeState() {
return this.optimizeState;
}
public void setOptimizeState(Integer value) {
this.optimizeState = value;
}
public Integer getIsCurrentBasic() {
return this.isCurrentBasic;
}
public void setIsCurrentBasic(Integer value) {
this.isCurrentBasic = value;
}
public Integer getStartInterval() {
return this.startInterval;
}
public void setStartInterval(Integer value) {
this.startInterval = value;
}
} }
package pps.core.space.service.data.space_institution_wellhead; package pps.core.space.service.data.space_institution_wellhead;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/**
* 间开制度井口配置
*
* @author ZWT
* @date 2023/09/05
*/
@Data
public class UpdateSpaceInstitutionWellheadInput { public class UpdateSpaceInstitutionWellheadInput {
@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 institutionId; private String institutionId;
...@@ -59,149 +45,4 @@ public class UpdateSpaceInstitutionWellheadInput { ...@@ -59,149 +45,4 @@ public class UpdateSpaceInstitutionWellheadInput {
@XText("运行时长(小时/天)") @XText("运行时长(小时/天)")
private BigDecimal runDuration; private BigDecimal runDuration;
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 getInstitutionId() {
return this.institutionId;
}
public void setInstitutionId(String value) {
this.institutionId = 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;
}
public String getRunTypeKey() {
return this.runTypeKey;
}
public void setRunTypeKey(String value) {
this.runTypeKey = value;
}
public String getIntervalTypeKey() {
return this.intervalTypeKey;
}
public void setIntervalTypeKey(String value) {
this.intervalTypeKey = value;
}
public String getIntervalDescribe() {
return this.intervalDescribe;
}
public void setIntervalDescribe(String value) {
this.intervalDescribe = value;
}
public Integer getStartSeq() {
return this.startSeq;
}
public void setStartSeq(Integer value) {
this.startSeq = value;
}
public Integer getOpenWellDay() {
return this.openWellDay;
}
public void setOpenWellDay(Integer value) {
this.openWellDay = value;
}
public Integer getCloseWellDay() {
return this.closeWellDay;
}
public void setCloseWellDay(Integer value) {
this.closeWellDay = value;
}
public BigDecimal getRunDuration() {
return this.runDuration;
}
public void setRunDuration(BigDecimal value) {
this.runDuration = value;
}
} }
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