Skip to content

G
gf_back
Commit aeb94de3 authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 基础信息配置 

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;
3.修改基础信息配置模块业务工具类,增加匹配查询地区名称方法;
4.修改基础信息配置模块业务工具类,增加匹配查询组织名称方法;
5.修改基础信息配置--市电峰谷配置模块详情接口,增加时段类型值返回结果字段;
6.修改基础信息配置--市电峰谷配置模块表结构字段类型,同时更新相应代码,修改部分接口业务处理逻辑,重新完成接口冒烟测试;
7.修改基础信息配置--输电线路配置模块表结构字段类型,同时更新相应代码,修改部分接口业务处理逻辑,重新完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 835585e0
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 1481 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineEnt.java
View file @ aeb94de3
...@@ -17,6 +17,7 @@ import java.io.Serializable; ...@@ -17,6 +17,7 @@ import java.io.Serializable;
@Data @Data
@TableName("base_power_line") @TableName("base_power_line")
public class BasePowerLineEnt extends BaseEnt implements Serializable { public class BasePowerLineEnt extends BaseEnt implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
...@@ -48,4 +49,8 @@ public class BasePowerLineEnt extends BaseEnt implements Serializable { ...@@ -48,4 +49,8 @@ public class BasePowerLineEnt extends BaseEnt implements Serializable {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
@TableField @TableField
private Integer isReverseDispatch; private Integer isReverseDispatch;
@XText("启动间隔(分钟)")
@TableField
private Integer startInterval;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineView.java
View file @ aeb94de3
...@@ -85,6 +85,10 @@ public class BasePowerLineView implements Serializable { ...@@ -85,6 +85,10 @@ public class BasePowerLineView implements Serializable {
@TableField @TableField
private Integer isReverseDispatch; private Integer isReverseDispatch;
@XText("启动间隔(分钟)")
@TableField
private Integer startInterval;
/** /**
* 策略名称 * 策略名称
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadEnt.java
View file @ aeb94de3
...@@ -29,4 +29,8 @@ public class BasePowerLineWellheadEnt extends BaseEnt implements Serializable { ...@@ -29,4 +29,8 @@ public class BasePowerLineWellheadEnt extends BaseEnt implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
@XText("启动顺序")
@TableField
private Integer startSeq;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadView.java
View file @ aeb94de3
...@@ -66,6 +66,10 @@ public class BasePowerLineWellheadView implements Serializable { ...@@ -66,6 +66,10 @@ public class BasePowerLineWellheadView implements Serializable {
@TableField @TableField
private String ouId; private String ouId;
@XText("启动顺序")
@TableField
private Integer startSeq;
/** /**
* 井号 * 井号
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ aeb94de3
...@@ -137,7 +137,7 @@ public class BasePowerLineService { ...@@ -137,7 +137,7 @@ public class BasePowerLineService {
* *
* @param context 上下文 * @param context 上下文
* @param input 输入 * @param input 输入
* @return {@link XSingleResult}<{@link GetBasePowerLineOutput}> * @return {@link XSingleResult}<{@link GetBasePowerLineViewOutput}>
*/ */
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
...@@ -184,6 +184,14 @@ public class BasePowerLineService { ...@@ -184,6 +184,14 @@ public class BasePowerLineService {
if (CollUtil.isNotEmpty(dieselViewList)) { if (CollUtil.isNotEmpty(dieselViewList)) {
output.setDieselOutputs(XCopyUtils.copyNewList(dieselViewList, GetBasePowerLineDieselViewOutput.class)); output.setDieselOutputs(XCopyUtils.copyNewList(dieselViewList, GetBasePowerLineDieselViewOutput.class));
} }
List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, DictTypeConstant.GRID_TYPE);
List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
output.setGridTypeName(
DictUtils.getDicNameByStream(gridTypeList, output.getGridTypeKey())
);
output.setLineTypeName(
DictUtils.getDicNameByStream(lineTypeList, output.getLineTypeKey())
);
return XSingleResult.success(output); return XSingleResult.success(output);
} }
...@@ -226,7 +234,7 @@ public class BasePowerLineService { ...@@ -226,7 +234,7 @@ public class BasePowerLineService {
* *
* @param context 上下文 * @param context 上下文
* @param input 输入 * @param input 输入
* @return {@link XListResult}<{@link QueryBasePowerLineOutput}> * @return {@link XListResult}<{@link DynamicQueryBasePowerLineOutput}>
*/ */
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/CreateBasePowerLineInput.java
View file @ aeb94de3
...@@ -45,6 +45,9 @@ public class CreateBasePowerLineInput { ...@@ -45,6 +45,9 @@ public class CreateBasePowerLineInput {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch; private Integer isReverseDispatch;
@XText("启动间隔(分钟)")
private Integer startInterval;
/** /**
* 输电线路柴发设备配置 * 输电线路柴发设备配置
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/CreateBasePowerLineOutput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class CreateBasePowerLineOutput {
@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 ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DeleteBasePowerLineOutput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class DeleteBasePowerLineOutput {
@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 ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DynamicQueryBasePowerLineViewOutput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class DynamicQueryBasePowerLineViewOutput {
@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 ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineOutput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class GetBasePowerLineOutput {
@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 ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineViewInput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class GetBasePowerLineViewInput {
@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 ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineViewOutput.java
View file @ aeb94de3
...@@ -46,6 +46,9 @@ public class GetBasePowerLineViewOutput { ...@@ -46,6 +46,9 @@ public class GetBasePowerLineViewOutput {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch; private Integer isReverseDispatch;
@XText("启动间隔(分钟)")
private Integer startInterval;
/** /**
* 策略名称 * 策略名称
*/ */
...@@ -58,6 +61,18 @@ public class GetBasePowerLineViewOutput { ...@@ -58,6 +61,18 @@ public class GetBasePowerLineViewOutput {
@XText("上级线路名称") @XText("上级线路名称")
private String upperLineName; private String upperLineName;
/**
* 电网类型名称
*/
@XText("电网类型名称")
private String gridTypeName;
/**
* 线路类型名称
*/
@XText("线路类型名称")
private String lineTypeName;
/** /**
* 输电线路柴发设备配置 * 输电线路柴发设备配置
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineInput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import xstartup.base.data.XPageInput;
public class QueryBasePowerLineInput 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")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineOutput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import xstartup.base.data.XPageInput;
public class QueryBasePowerLineOutput 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")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineViewOutput.java
View file @ aeb94de3
...@@ -39,6 +39,9 @@ public class QueryBasePowerLineViewOutput extends XPageInput { ...@@ -39,6 +39,9 @@ public class QueryBasePowerLineViewOutput extends XPageInput {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch; private Integer isReverseDispatch;
@XText("启动间隔(分钟)")
private Integer startInterval;
/** /**
* 上级线路名称 * 上级线路名称
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/UpdateBasePowerLineInput.java
View file @ aeb94de3
...@@ -49,6 +49,9 @@ public class UpdateBasePowerLineInput { ...@@ -49,6 +49,9 @@ public class UpdateBasePowerLineInput {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch; private Integer isReverseDispatch;
@XText("启动间隔(分钟)")
private Integer startInterval;
/** /**
* 输电线路柴发设备配置 * 输电线路柴发设备配置
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/UpdateBasePowerLineOutput.java deleted 100644 → 0
View file @ 835585e0
package pps.core.base.service.data.base_power_line;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class UpdateBasePowerLineOutput {
@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 ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("是否激活共享调度(0_激活;1_关闭)")
private Integer isShareDispatch;
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/CreateBasePowerLineWellheadInput.java
View file @ aeb94de3
...@@ -16,4 +16,7 @@ public class CreateBasePowerLineWellheadInput { ...@@ -16,4 +16,7 @@ public class CreateBasePowerLineWellheadInput {
@XText("井口ID") @XText("井口ID")
@NotBlank(message = "缺少井口ID") @NotBlank(message = "缺少井口ID")
private String wellheadId; private String wellheadId;
@XText("启动顺序")
private Integer startSeq;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/DynamicQueryBasePowerLineWellheadViewOutput.java
View file @ aeb94de3
...@@ -18,6 +18,9 @@ public class DynamicQueryBasePowerLineWellheadViewOutput { ...@@ -18,6 +18,9 @@ public class DynamicQueryBasePowerLineWellheadViewOutput {
@XText("井口ID") @XText("井口ID")
private String wellheadId; private String wellheadId;
@XText("启动顺序")
private Integer startSeq;
/** /**
* 井号 * 井号
*/ */
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/GetBasePowerLineWellheadViewOutput.java
View file @ aeb94de3
package pps.core.base.service.data.base_power_line_wellhead; package pps.core.base.service.data.base_power_line_wellhead;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -25,13 +24,14 @@ public class GetBasePowerLineWellheadViewOutput { ...@@ -25,13 +24,14 @@ public class GetBasePowerLineWellheadViewOutput {
* 井号 * 井号
*/ */
@XText("井号") @XText("井号")
@TableField
private String wellNumber; private String wellNumber;
/** /**
* 运行功率 * 运行功率
*/ */
@XText("运行功率(KW)") @XText("运行功率(KW)")
@TableField
private BigDecimal serviceRating; private BigDecimal serviceRating;
@XText("启动顺序")
private Integer startSeq;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/UpdateBasePowerLineWellheadInput.java
View file @ aeb94de3
...@@ -16,4 +16,7 @@ public class UpdateBasePowerLineWellheadInput { ...@@ -16,4 +16,7 @@ public class UpdateBasePowerLineWellheadInput {
@XText("井口ID") @XText("井口ID")
@NotBlank(message = "缺少井口ID") @NotBlank(message = "缺少井口ID")
private String wellheadId; private String wellheadId;
@XText("启动顺序")
private Integer startSeq;
} }
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineViewMapper.xml
View file @ aeb94de3
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<result column="strategy_id" property="strategyId" jdbcType="VARCHAR"/> <result column="strategy_id" property="strategyId" jdbcType="VARCHAR"/>
<result column="is_share_dispatch" property="isShareDispatch" jdbcType="INTEGER"/> <result column="is_share_dispatch" property="isShareDispatch" jdbcType="INTEGER"/>
<result column="is_reverse_dispatch" property="isReverseDispatch" jdbcType="INTEGER"/> <result column="is_reverse_dispatch" property="isReverseDispatch" jdbcType="INTEGER"/>
<result column="start_interval" property="startInterval" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
...@@ -36,7 +37,8 @@ ...@@ -36,7 +37,8 @@
line_type_key, line_type_key,
strategy_id, strategy_id,
is_share_dispatch, is_share_dispatch,
is_reverse_dispatch is_reverse_dispatch,
start_interval
</sql> </sql>
<resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineView" extends="BaseResultMap"> <resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineView" extends="BaseResultMap">
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineWellheadViewMapper.xml
View file @ aeb94de3
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<result column="line_id" property="lineId" jdbcType="VARCHAR"/> <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
<result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/> <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/> <result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="start_seq" property="startSeq" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
...@@ -26,7 +27,8 @@ ...@@ -26,7 +27,8 @@
modify_time, modify_time,
line_id, line_id,
wellhead_id, wellhead_id,
ou_id ou_id,
start_seq
</sql> </sql>
<resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineWellheadView" extends="BaseResultMap"> <resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineWellheadView" extends="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