Skip to content

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

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

1.创建space_interval_system 间开制度详情,space_interval_wellhead_config
间开制度井口配置,space_interval_duration
间开制度小间开时段配置表,生成相关代码并添加到项目space模块,解决编译报错问题;
2.添加间开制度管理模块接口文档配置;
3.添加工具类,及基础实体类,处理基础字段;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 3e356aeb
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 581 deletions
C02-system/pps-core-system/src/main/java/pps/core/system/constant/DictTypeConstant.java 0 → 100644
View file @ 7a0ce27d
package pps.core.system.constant;
/**
* 字典类型常量
*
* @author ZWT
* @date 2023/08/29 15:01
*/
public class DictTypeConstant {
/**
* 线路类型
*/
public static final String LINE_TYPE = "line_type";
/**
* 电网类型
*/
public static final String GRID_TYPE = "grid_type";
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ 7a0ce27d
......@@ -19,6 +19,7 @@ import pps.core.base.service.data.base_power_line_wellhead.GetBasePowerLineWellh
import pps.core.base.utils.DictUtils;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseEntUtils;
import pps.core.system.constant.DictTypeConstant;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
......@@ -204,8 +205,8 @@ public class BasePowerLineService {
PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
String ouName = this.getSysOrgNameById(context, input.getOuId());
List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, "grid_type");
List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, "line_type");
List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, DictTypeConstant.GRID_TYPE);
List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
for (QueryBasePowerLineViewOutput output : outputs) {
output.setOuName(ouName);
output.setGridTypeName(gridTypeList.stream()
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_interval_system/CreateSpaceIntervalSystemInput.java
View file @ 7a0ce27d
......@@ -13,29 +13,6 @@ import java.util.Date;
*/
@Data
public class CreateSpaceIntervalSystemInput {
@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;
......@@ -55,9 +32,6 @@ public class CreateSpaceIntervalSystemInput {
@XText("制度结束时间")
private Date systemEndDate;
@XText("优化至")
private String optimizedTo;
@XText("当前运行制度(0_是;1_否)")
private Integer isCurrentRun;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_interval_system/CreateSpaceIntervalSystemOutput.java deleted 100644 → 0
View file @ 3e356aeb
package pps.core.space.service.data.space_interval_system;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class CreateSpaceIntervalSystemOutput {
@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 lineId;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("制度名称")
private String systemName;
@XText("制度开始时间")
private Date systemStartDate;
@XText("制度结束时间")
private Date systemEndDate;
@XText("优化至")
private String optimizedTo;
@XText("当前运行制度(0_是;1_否)")
private Integer isCurrentRun;
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 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 getSystemName() {
return this.systemName;
}
public void setSystemName(String value) {
this.systemName = value;
}
public Date getSystemStartDate() {
return this.systemStartDate;
}
public void setSystemStartDate(Date value) {
this.systemStartDate = value;
}
public Date getSystemEndDate() {
return this.systemEndDate;
}
public void setSystemEndDate(Date value) {
this.systemEndDate = value;
}
public String getOptimizedTo() {
return this.optimizedTo;
}
public void setOptimizedTo(String value) {
this.optimizedTo = value;
}
public Integer getIsCurrentRun() {
return this.isCurrentRun;
}
public void setIsCurrentRun(Integer value) {
this.isCurrentRun = value;
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_interval_system/DeleteSpaceIntervalSystemOutput.java deleted 100644 → 0
View file @ 3e356aeb
package pps.core.space.service.data.space_interval_system;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class DeleteSpaceIntervalSystemOutput {
@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 lineId;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("制度名称")
private String systemName;
@XText("制度开始时间")
private Date systemStartDate;
@XText("制度结束时间")
private Date systemEndDate;
@XText("优化至")
private String optimizedTo;
@XText("当前运行制度(0_是;1_否)")
private Integer isCurrentRun;
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 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 getSystemName() {
return this.systemName;
}
public void setSystemName(String value) {
this.systemName = value;
}
public Date getSystemStartDate() {
return this.systemStartDate;
}
public void setSystemStartDate(Date value) {
this.systemStartDate = value;
}
public Date getSystemEndDate() {
return this.systemEndDate;
}
public void setSystemEndDate(Date value) {
this.systemEndDate = value;
}
public String getOptimizedTo() {
return this.optimizedTo;
}
public void setOptimizedTo(String value) {
this.optimizedTo = value;
}
public Integer getIsCurrentRun() {
return this.isCurrentRun;
}
public void setIsCurrentRun(Integer value) {
this.isCurrentRun = value;
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_interval_system/UpdateSpaceIntervalSystemOutput.java deleted 100644 → 0
View file @ 3e356aeb
package pps.core.space.service.data.space_interval_system;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
public class UpdateSpaceIntervalSystemOutput {
@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 lineId;
@XText("电网类型key(字典获取)")
private String gridTypeKey;
@XText("制度名称")
private String systemName;
@XText("制度开始时间")
private Date systemStartDate;
@XText("制度结束时间")
private Date systemEndDate;
@XText("优化至")
private String optimizedTo;
@XText("当前运行制度(0_是;1_否)")
private Integer isCurrentRun;
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 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 getSystemName() {
return this.systemName;
}
public void setSystemName(String value) {
this.systemName = value;
}
public Date getSystemStartDate() {
return this.systemStartDate;
}
public void setSystemStartDate(Date value) {
this.systemStartDate = value;
}
public Date getSystemEndDate() {
return this.systemEndDate;
}
public void setSystemEndDate(Date value) {
this.systemEndDate = value;
}
public String getOptimizedTo() {
return this.optimizedTo;
}
public void setOptimizedTo(String value) {
this.optimizedTo = value;
}
public Integer getIsCurrentRun() {
return this.isCurrentRun;
}
public void setIsCurrentRun(Integer value) {
this.isCurrentRun = 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