Commit 9632c08e authored by luoxiangyang's avatar luoxiangyang

Merge remote-tracking branch 'origin/master'

parents 9a995b5b fe1d3f8d
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 基础
*
* @author ZWT
* @date 2023/08/25 15:46
*/
@Data
public class BaseEnt {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
@TableName("base_power_line_diesel")
public class BasePowerLineDieselEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
import java.io.Serializable;
@XText("修改时间")
@TableField
private Date modifyTime;
/**
* 输电线路柴发设备配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
@TableName("base_power_line_diesel")
public class BasePowerLineDieselEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......@@ -50,85 +24,4 @@ public class BasePowerLineDieselEnt implements Serializable {
@XText("柴发设备ID")
@TableField
private String dieselId;
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 getDieselId() {
return this.dieselId;
}
public void setDieselId(String value) {
this.dieselId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路柴发设备配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineDieselView implements Serializable {
@XText("ID")
@TableField
......@@ -46,85 +54,4 @@ public class BasePowerLineDieselView implements Serializable {
@XText("柴发设备ID")
@TableField
private String dieselId;
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 getDieselId() {
return this.dieselId;
}
public void setDieselId(String value) {
this.dieselId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
@TableName("base_power_line")
public class BasePowerLineEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
import java.io.Serializable;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
@TableName("base_power_line")
public class BasePowerLineEnt extends BaseEnt implements Serializable {
@XText("组织机构ID")
@TableField
private String ouId;
@XText("上级线路ID")
@TableField
private String upperLineId;
@XText("线路名称")
@TableField
private String lineName;
......@@ -70,125 +47,4 @@ public class BasePowerLineEnt implements Serializable {
@XText("是否激活返输调度(0_激活;1_关闭)")
@TableField
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 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;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
@TableName("base_power_line_plant")
public class BasePowerLinePlantEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
import java.io.Serializable;
@XText("修改时间")
@TableField
private Date modifyTime;
/**
* 输电线路光伏配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
@TableName("base_power_line_plant")
public class BasePowerLinePlantEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......@@ -50,85 +24,4 @@ public class BasePowerLinePlantEnt implements Serializable {
@XText("光伏电站ID")
@TableField
private String plantId;
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 getPlantId() {
return this.plantId;
}
public void setPlantId(String value) {
this.plantId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路光伏配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLinePlantView implements Serializable {
@XText("ID")
@TableField
......@@ -46,85 +54,4 @@ public class BasePowerLinePlantView implements Serializable {
@XText("光伏电站ID")
@TableField
private String plantId;
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 getPlantId() {
return this.plantId;
}
public void setPlantId(String value) {
this.plantId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
@TableName("base_power_line_storage")
public class BasePowerLineStorageEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
import java.io.Serializable;
@XText("修改时间")
@TableField
private Date modifyTime;
/**
* 输电线路储能配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
@TableName("base_power_line_storage")
public class BasePowerLineStorageEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......@@ -50,85 +24,4 @@ public class BasePowerLineStorageEnt implements Serializable {
@XText("储能设备ID")
@TableField
private String storageId;
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 getStorageId() {
return this.storageId;
}
public void setStorageId(String value) {
this.storageId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路储能配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineStorageView implements Serializable {
@XText("ID")
@TableField
......@@ -46,85 +54,4 @@ public class BasePowerLineStorageView implements Serializable {
@XText("储能设备ID")
@TableField
private String storageId;
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 getStorageId() {
return this.storageId;
}
public void setStorageId(String value) {
this.storageId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineView implements Serializable {
@XText("ID")
@TableField
......@@ -43,6 +51,10 @@ public class BasePowerLineView implements Serializable {
@TableField
private String ouId;
@XText("上级线路ID")
@TableField
private String upperLineId;
@XText("线路名称")
@TableField
private String lineName;
......@@ -66,125 +78,4 @@ public class BasePowerLineView implements Serializable {
@XText("是否激活返输调度(0_激活;1_关闭)")
@TableField
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 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;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
@TableName("base_power_line_wellhead")
public class BasePowerLineWellheadEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
import java.io.Serializable;
@XText("修改时间")
@TableField
private Date modifyTime;
/**
* 输电线路井口配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
@TableName("base_power_line_wellhead")
public class BasePowerLineWellheadEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......@@ -50,85 +24,4 @@ public class BasePowerLineWellheadEnt implements Serializable {
@XText("井口ID")
@TableField
private String wellheadId;
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 getWellheadId() {
return this.wellheadId;
}
public void setWellheadId(String value) {
this.wellheadId = value;
}
}
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路井口配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineWellheadView implements Serializable {
@XText("ID")
@TableField
......@@ -46,85 +54,4 @@ public class BasePowerLineWellheadView implements Serializable {
@XText("井口ID")
@TableField
private String wellheadId;
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 getWellheadId() {
return this.wellheadId;
}
public void setWellheadId(String value) {
this.wellheadId = value;
}
}
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -19,38 +17,7 @@ import java.util.Date;
*/
@Data
@TableName("base_price_strategy_detail")
public class BasePriceStrategyDetailEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
public class BasePriceStrategyDetailEnt extends BaseEnt implements Serializable {
@XText("市电峰谷配置ID")
@TableField
......@@ -59,7 +26,6 @@ public class BasePriceStrategyDetailEnt implements Serializable {
@XText("市电峰谷月")
@TableField
private Integer strategyMonth;
;
@XText("时段类型key(字典获取)")
@TableField
......
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 市电峰谷策略
......@@ -19,39 +16,7 @@ import java.util.Date;
*/
@Data
@TableName("base_price_strategy")
public class BasePriceStrategyEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
public class BasePriceStrategyEnt extends BaseEnt implements Serializable {
@XText("策略名称")
@TableField
......
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import jakarta.validation.Valid;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
......@@ -20,38 +17,7 @@ import java.util.List;
*/
@Data
@TableName("base_price_strategy_month")
public class BasePriceStrategyMonthEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
public class BasePriceStrategyMonthEnt extends BaseEnt implements Serializable {
@XText("市电峰谷配置ID")
@TableField
......
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePriceStrategyView implements Serializable {
@XText("ID")
@TableField
......@@ -59,108 +68,9 @@ public class BasePriceStrategyView implements Serializable {
@TableField
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = value;
}
/*-----------------------------扩展字段-----------------------------*/
@XText("是否固定电价")
@TableField
private String isFixedPriceValue;
}
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePowerLineEnt;
@Repository(value="pps.core.base.mapper.BasePowerLineMapper")
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Repository(value = "pps.core.base.mapper.BasePowerLineMapper")
public interface BasePowerLineMapper extends BaseMapper<BasePowerLineEnt> {
}
package pps.core.base.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyDetailView;
import pps.core.base.entity.BasePriceStrategyMonthEnt;
import java.util.List;
......@@ -18,14 +16,4 @@ public interface BasePriceStrategyDetailViewMapper {
BasePriceStrategyDetailView selectOne(BasePriceStrategyDetailView record);
List<BasePriceStrategyDetailView> selectList(BasePriceStrategyDetailView record);
/**
* 删除月份对应详情信息
*
* @param strategyId 战略id
* @param monthList 月清单
* @return int
*/
int deleteBatchByStrategyMonth(@Param(value = "strategyId") String strategyId,
@Param(value = "monthList") List<BasePriceStrategyMonthEnt> monthList);
}
package pps.core.base.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyMonthEnt;
import pps.core.base.entity.BasePriceStrategyMonthView;
import java.util.List;
......@@ -18,14 +16,4 @@ public interface BasePriceStrategyMonthViewMapper {
BasePriceStrategyMonthView selectOne(BasePriceStrategyMonthView record);
List<BasePriceStrategyMonthView> selectList(BasePriceStrategyMonthView record);
/**
* 删除月份对应详情信息
*
* @param strategyId 战略id
* @param monthList 月清单
* @return int
*/
int deleteBatchByStrategyMonth(@Param(value = "strategyId") String strategyId,
@Param(value = "monthList") List<BasePriceStrategyMonthEnt> monthList);
}
package pps.core.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyView;
import java.util.List;
@Repository(value="pps.core.base.mapper.BasePriceStrategyViewMapper")
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/25
*/
@Repository(value = "pps.core.base.mapper.BasePriceStrategyViewMapper")
public interface BasePriceStrategyViewMapper {
BasePriceStrategyView selectOne(BasePriceStrategyView record);
List<BasePriceStrategyView> selectList(BasePriceStrategyView record);
/**
* 列表
*
* @param record 记录
* @return {@link List}<{@link BasePriceStrategyView}>
*/
List<BasePriceStrategyView> selectList(@Param(value = "param") BasePriceStrategyView record);
}
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLineDieselEnt;
import pps.core.base.entity.BasePowerLineDieselView;
import pps.core.base.mapper.BasePowerLineDieselMapper;
import pps.core.base.mapper.BasePowerLineDieselViewMapper;
import pps.core.base.service.data.base_power_line_diesel.*;
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 BasePowerLineDieselService {
@XApiAnonymous
@XApiPost
public XServiceResult createBasePowerLineDiesel(XContext context, CreateBasePowerLineDieselInput input) {
BasePowerLineDieselMapper mapper = context.getBean(BasePowerLineDieselMapper.class);
BasePowerLineDieselEnt entity = new BasePowerLineDieselEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateBasePowerLineDiesel(XContext context, UpdateBasePowerLineDieselInput input) {
BasePowerLineDieselMapper mapper = context.getBean(BasePowerLineDieselMapper.class);
QueryWrapper<BasePowerLineDieselEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineDieselEnt::getId, input.getId());
BasePowerLineDieselEnt 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 deleteBasePowerLineDiesel(XContext context, DeleteBasePowerLineDieselInput input) {
BasePowerLineDieselMapper mapper = context.getBean(BasePowerLineDieselMapper.class);
QueryWrapper<BasePowerLineDieselEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineDieselEnt::getId, input.getId());
BasePowerLineDieselEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLineDieselOutput> getBasePowerLineDiesel(XContext context, GetBasePowerLineDieselInput input) {
BasePowerLineDieselMapper mapper = context.getBean(BasePowerLineDieselMapper.class);
QueryWrapper<BasePowerLineDieselEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineDieselEnt::getId, input.getId());
BasePowerLineDieselEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLineDieselOutput output = new GetBasePowerLineDieselOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineDieselOutput> queryBasePowerLineDiesel(XContext context, QueryBasePowerLineDieselInput input) {
BasePowerLineDieselMapper mapper = context.getBean(BasePowerLineDieselMapper.class);
QueryWrapper<BasePowerLineDieselEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BasePowerLineDieselEnt::getId, input.getId())
.eq(BasePowerLineDieselEnt::getIsDeleted, input.getIsDeleted())
.like(BasePowerLineDieselEnt::getCreateById, input.getCreateById())
.like(BasePowerLineDieselEnt::getCreateByName, input.getCreateByName())
.eq(BasePowerLineDieselEnt::getCreateTime, input.getCreateTime())
.like(BasePowerLineDieselEnt::getModifyById, input.getModifyById())
.like(BasePowerLineDieselEnt::getModifyByName, input.getModifyByName())
.eq(BasePowerLineDieselEnt::getModifyTime, input.getModifyTime())
.like(BasePowerLineDieselEnt::getLineId, input.getLineId())
.like(BasePowerLineDieselEnt::getDieselId, input.getDieselId());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePowerLineDieselOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineDieselOutput> dynamicQueryBasePowerLineDiesel(XContext context, CustomQueryInput input) {
BasePowerLineDieselMapper mapper = context.getBean(BasePowerLineDieselMapper.class);
return XMapperHelper.query(mapper, input, BasePowerLineDieselEnt.class, QueryBasePowerLineDieselOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLineDieselViewOutput> getBasePowerLineDieselView(XContext context, GetBasePowerLineDieselViewInput input) {
BasePowerLineDieselViewMapper mapper = context.getBean(BasePowerLineDieselViewMapper.class);
BasePowerLineDieselView record = new BasePowerLineDieselView();
XCopyUtils.copyObject(input, record);
BasePowerLineDieselView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLineDieselViewOutput output = new GetBasePowerLineDieselViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineDieselViewOutput> queryBasePowerLineDieselView(XContext context, QueryBasePowerLineDieselViewInput input) {
BasePowerLineDieselViewMapper mapper = context.getBean(BasePowerLineDieselViewMapper.class);
BasePowerLineDieselView record = new BasePowerLineDieselView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePowerLineDieselView> list = mapper.selectList(record);
PageInfo<BasePowerLineDieselView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineDieselViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineDieselViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLinePlantEnt;
import pps.core.base.entity.BasePowerLinePlantView;
import pps.core.base.mapper.BasePowerLinePlantMapper;
import pps.core.base.mapper.BasePowerLinePlantViewMapper;
import pps.core.base.service.data.base_power_line_plant.*;
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 BasePowerLinePlantService {
@XApiAnonymous
@XApiPost
public XServiceResult createBasePowerLinePlant(XContext context, CreateBasePowerLinePlantInput input) {
BasePowerLinePlantMapper mapper = context.getBean(BasePowerLinePlantMapper.class);
BasePowerLinePlantEnt entity = new BasePowerLinePlantEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateBasePowerLinePlant(XContext context, UpdateBasePowerLinePlantInput input) {
BasePowerLinePlantMapper mapper = context.getBean(BasePowerLinePlantMapper.class);
QueryWrapper<BasePowerLinePlantEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLinePlantEnt::getId, input.getId());
BasePowerLinePlantEnt 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 deleteBasePowerLinePlant(XContext context, DeleteBasePowerLinePlantInput input) {
BasePowerLinePlantMapper mapper = context.getBean(BasePowerLinePlantMapper.class);
QueryWrapper<BasePowerLinePlantEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLinePlantEnt::getId, input.getId());
BasePowerLinePlantEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLinePlantOutput> getBasePowerLinePlant(XContext context, GetBasePowerLinePlantInput input) {
BasePowerLinePlantMapper mapper = context.getBean(BasePowerLinePlantMapper.class);
QueryWrapper<BasePowerLinePlantEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLinePlantEnt::getId, input.getId());
BasePowerLinePlantEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLinePlantOutput output = new GetBasePowerLinePlantOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLinePlantOutput> queryBasePowerLinePlant(XContext context, QueryBasePowerLinePlantInput input) {
BasePowerLinePlantMapper mapper = context.getBean(BasePowerLinePlantMapper.class);
QueryWrapper<BasePowerLinePlantEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BasePowerLinePlantEnt::getId, input.getId())
.eq(BasePowerLinePlantEnt::getIsDeleted, input.getIsDeleted())
.like(BasePowerLinePlantEnt::getCreateById, input.getCreateById())
.like(BasePowerLinePlantEnt::getCreateByName, input.getCreateByName())
.eq(BasePowerLinePlantEnt::getCreateTime, input.getCreateTime())
.like(BasePowerLinePlantEnt::getModifyById, input.getModifyById())
.like(BasePowerLinePlantEnt::getModifyByName, input.getModifyByName())
.eq(BasePowerLinePlantEnt::getModifyTime, input.getModifyTime())
.like(BasePowerLinePlantEnt::getLineId, input.getLineId())
.like(BasePowerLinePlantEnt::getPlantId, input.getPlantId());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePowerLinePlantOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLinePlantOutput> dynamicQueryBasePowerLinePlant(XContext context, CustomQueryInput input) {
BasePowerLinePlantMapper mapper = context.getBean(BasePowerLinePlantMapper.class);
return XMapperHelper.query(mapper, input, BasePowerLinePlantEnt.class, QueryBasePowerLinePlantOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLinePlantViewOutput> getBasePowerLinePlantView(XContext context, GetBasePowerLinePlantViewInput input) {
BasePowerLinePlantViewMapper mapper = context.getBean(BasePowerLinePlantViewMapper.class);
BasePowerLinePlantView record = new BasePowerLinePlantView();
XCopyUtils.copyObject(input, record);
BasePowerLinePlantView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLinePlantViewOutput output = new GetBasePowerLinePlantViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLinePlantViewOutput> queryBasePowerLinePlantView(XContext context, QueryBasePowerLinePlantViewInput input) {
BasePowerLinePlantViewMapper mapper = context.getBean(BasePowerLinePlantViewMapper.class);
BasePowerLinePlantView record = new BasePowerLinePlantView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePowerLinePlantView> list = mapper.selectList(record);
PageInfo<BasePowerLinePlantView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLinePlantViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLinePlantViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
......@@ -3,11 +3,15 @@ package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.entity.BasePowerLineView;
import pps.core.base.mapper.BasePowerLineMapper;
import pps.core.base.mapper.BasePowerLineViewMapper;
import pps.core.base.entity.*;
import pps.core.base.mapper.*;
import pps.core.base.service.data.base_power_line.*;
import pps.core.base.service.data.base_power_line_diesel.CreateBasePowerLineDieselInput;
import pps.core.base.service.data.base_power_line_plant.CreateBasePowerLinePlantInput;
import pps.core.base.service.data.base_power_line_storage.CreateBasePowerLineStorageInput;
import pps.core.base.service.data.base_power_line_wellhead.CreateBasePowerLineWellheadInput;
import pps.core.base.utils.BaseEntUtils;
import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
......@@ -21,6 +25,7 @@ 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 xstartup.helper.XTransactionHelper;
import java.util.List;
......@@ -28,19 +33,76 @@ import java.util.List;
* 输电线路配置模块
*
* @author ZWT
* @date 2023/08/24
* @date 2023/08/25
*/
@XService
@XText("输电线路配置模块")
public class BasePowerLineService {
/**
* 输电线路配置--新增
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XApiAnonymous
@XApiPost
@XText("输电线路配置--新增")
public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = new BasePowerLineEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class);
//新增输电线路
BaseEntUtils.setBaseEntDefault(entity, session);
mapper.insert(entity);
String lineId = entity.getId();
//新增井口配置
List<CreateBasePowerLineWellheadInput> wellheadInputs = input.getWellheadInputs();
if (!wellheadInputs.isEmpty()) {
List<BasePowerLineWellheadEnt> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadEnt.class);
for (BasePowerLineWellheadEnt wellhead : wellheads) {
wellhead.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(wellhead, session);
}
BaseEntUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellheadEnt.class, wellheads);
}
//新增光伏配置
List<CreateBasePowerLinePlantInput> plantInputs = input.getPlantInputs();
if (!plantInputs.isEmpty()) {
List<BasePowerLinePlantEnt> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantEnt.class);
for (BasePowerLinePlantEnt plant : plants) {
plant.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(plant, session);
}
BaseEntUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlantEnt.class, plants);
}
//新增储能配置
List<CreateBasePowerLineStorageInput> storageInputs = input.getStorageInputs();
if (!storageInputs.isEmpty()) {
List<BasePowerLineStorageEnt> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageEnt.class);
for (BasePowerLineStorageEnt storage : storages) {
storage.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(storage, session);
}
BaseEntUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorageEnt.class, storages);
}
//新增柴发配置
List<CreateBasePowerLineDieselInput> dieselInputs = input.getDieselInputs();
if (!dieselInputs.isEmpty()) {
List<BasePowerLineDieselEnt> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselEnt.class);
for (BasePowerLineDieselEnt diesel : diesels) {
diesel.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(diesel, session);
}
BaseEntUtils.batchInsert(BasePowerLineDieselMapper.class, BasePowerLineDieselEnt.class, diesels);
}
return XServiceResult.OK;
});
}
@XApiAnonymous
......@@ -101,6 +163,7 @@ public class BasePowerLineService {
.like(BasePowerLineEnt::getModifyByName, input.getModifyByName())
.eq(BasePowerLineEnt::getModifyTime, input.getModifyTime())
.like(BasePowerLineEnt::getOuId, input.getOuId())
.like(BasePowerLineEnt::getUpperLineId, input.getUpperLineId())
.like(BasePowerLineEnt::getLineName, input.getLineName())
.like(BasePowerLineEnt::getGridTypeKey, input.getGridTypeKey())
.like(BasePowerLineEnt::getLineTypeKey, input.getLineTypeKey())
......
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLineStorageEnt;
import pps.core.base.entity.BasePowerLineStorageView;
import pps.core.base.mapper.BasePowerLineStorageMapper;
import pps.core.base.mapper.BasePowerLineStorageViewMapper;
import pps.core.base.service.data.base_power_line_storage.*;
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 BasePowerLineStorageService {
@XApiAnonymous
@XApiPost
public XServiceResult createBasePowerLineStorage(XContext context, CreateBasePowerLineStorageInput input) {
BasePowerLineStorageMapper mapper = context.getBean(BasePowerLineStorageMapper.class);
BasePowerLineStorageEnt entity = new BasePowerLineStorageEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateBasePowerLineStorage(XContext context, UpdateBasePowerLineStorageInput input) {
BasePowerLineStorageMapper mapper = context.getBean(BasePowerLineStorageMapper.class);
QueryWrapper<BasePowerLineStorageEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineStorageEnt::getId, input.getId());
BasePowerLineStorageEnt 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 deleteBasePowerLineStorage(XContext context, DeleteBasePowerLineStorageInput input) {
BasePowerLineStorageMapper mapper = context.getBean(BasePowerLineStorageMapper.class);
QueryWrapper<BasePowerLineStorageEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineStorageEnt::getId, input.getId());
BasePowerLineStorageEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLineStorageOutput> getBasePowerLineStorage(XContext context, GetBasePowerLineStorageInput input) {
BasePowerLineStorageMapper mapper = context.getBean(BasePowerLineStorageMapper.class);
QueryWrapper<BasePowerLineStorageEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineStorageEnt::getId, input.getId());
BasePowerLineStorageEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLineStorageOutput output = new GetBasePowerLineStorageOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineStorageOutput> queryBasePowerLineStorage(XContext context, QueryBasePowerLineStorageInput input) {
BasePowerLineStorageMapper mapper = context.getBean(BasePowerLineStorageMapper.class);
QueryWrapper<BasePowerLineStorageEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BasePowerLineStorageEnt::getId, input.getId())
.eq(BasePowerLineStorageEnt::getIsDeleted, input.getIsDeleted())
.like(BasePowerLineStorageEnt::getCreateById, input.getCreateById())
.like(BasePowerLineStorageEnt::getCreateByName, input.getCreateByName())
.eq(BasePowerLineStorageEnt::getCreateTime, input.getCreateTime())
.like(BasePowerLineStorageEnt::getModifyById, input.getModifyById())
.like(BasePowerLineStorageEnt::getModifyByName, input.getModifyByName())
.eq(BasePowerLineStorageEnt::getModifyTime, input.getModifyTime())
.like(BasePowerLineStorageEnt::getLineId, input.getLineId())
.like(BasePowerLineStorageEnt::getStorageId, input.getStorageId());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePowerLineStorageOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineStorageOutput> dynamicQueryBasePowerLineStorage(XContext context, CustomQueryInput input) {
BasePowerLineStorageMapper mapper = context.getBean(BasePowerLineStorageMapper.class);
return XMapperHelper.query(mapper, input, BasePowerLineStorageEnt.class, QueryBasePowerLineStorageOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLineStorageViewOutput> getBasePowerLineStorageView(XContext context, GetBasePowerLineStorageViewInput input) {
BasePowerLineStorageViewMapper mapper = context.getBean(BasePowerLineStorageViewMapper.class);
BasePowerLineStorageView record = new BasePowerLineStorageView();
XCopyUtils.copyObject(input, record);
BasePowerLineStorageView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLineStorageViewOutput output = new GetBasePowerLineStorageViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineStorageViewOutput> queryBasePowerLineStorageView(XContext context, QueryBasePowerLineStorageViewInput input) {
BasePowerLineStorageViewMapper mapper = context.getBean(BasePowerLineStorageViewMapper.class);
BasePowerLineStorageView record = new BasePowerLineStorageView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePowerLineStorageView> list = mapper.selectList(record);
PageInfo<BasePowerLineStorageView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineStorageViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineStorageViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLineWellheadEnt;
import pps.core.base.entity.BasePowerLineWellheadView;
import pps.core.base.mapper.BasePowerLineWellheadMapper;
import pps.core.base.mapper.BasePowerLineWellheadViewMapper;
import pps.core.base.service.data.base_power_line_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 BasePowerLineWellheadService {
@XApiAnonymous
@XApiPost
public XServiceResult createBasePowerLineWellhead(XContext context, CreateBasePowerLineWellheadInput input) {
BasePowerLineWellheadMapper mapper = context.getBean(BasePowerLineWellheadMapper.class);
BasePowerLineWellheadEnt entity = new BasePowerLineWellheadEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateBasePowerLineWellhead(XContext context, UpdateBasePowerLineWellheadInput input) {
BasePowerLineWellheadMapper mapper = context.getBean(BasePowerLineWellheadMapper.class);
QueryWrapper<BasePowerLineWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineWellheadEnt::getId, input.getId());
BasePowerLineWellheadEnt 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 deleteBasePowerLineWellhead(XContext context, DeleteBasePowerLineWellheadInput input) {
BasePowerLineWellheadMapper mapper = context.getBean(BasePowerLineWellheadMapper.class);
QueryWrapper<BasePowerLineWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineWellheadEnt::getId, input.getId());
BasePowerLineWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLineWellheadOutput> getBasePowerLineWellhead(XContext context, GetBasePowerLineWellheadInput input) {
BasePowerLineWellheadMapper mapper = context.getBean(BasePowerLineWellheadMapper.class);
QueryWrapper<BasePowerLineWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineWellheadEnt::getId, input.getId());
BasePowerLineWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLineWellheadOutput output = new GetBasePowerLineWellheadOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineWellheadOutput> queryBasePowerLineWellhead(XContext context, QueryBasePowerLineWellheadInput input) {
BasePowerLineWellheadMapper mapper = context.getBean(BasePowerLineWellheadMapper.class);
QueryWrapper<BasePowerLineWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BasePowerLineWellheadEnt::getId, input.getId())
.eq(BasePowerLineWellheadEnt::getIsDeleted, input.getIsDeleted())
.like(BasePowerLineWellheadEnt::getCreateById, input.getCreateById())
.like(BasePowerLineWellheadEnt::getCreateByName, input.getCreateByName())
.eq(BasePowerLineWellheadEnt::getCreateTime, input.getCreateTime())
.like(BasePowerLineWellheadEnt::getModifyById, input.getModifyById())
.like(BasePowerLineWellheadEnt::getModifyByName, input.getModifyByName())
.eq(BasePowerLineWellheadEnt::getModifyTime, input.getModifyTime())
.like(BasePowerLineWellheadEnt::getLineId, input.getLineId())
.like(BasePowerLineWellheadEnt::getWellheadId, input.getWellheadId());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePowerLineWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineWellheadOutput> dynamicQueryBasePowerLineWellhead(XContext context, CustomQueryInput input) {
BasePowerLineWellheadMapper mapper = context.getBean(BasePowerLineWellheadMapper.class);
return XMapperHelper.query(mapper, input, BasePowerLineWellheadEnt.class, QueryBasePowerLineWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePowerLineWellheadViewOutput> getBasePowerLineWellheadView(XContext context, GetBasePowerLineWellheadViewInput input) {
BasePowerLineWellheadViewMapper mapper = context.getBean(BasePowerLineWellheadViewMapper.class);
BasePowerLineWellheadView record = new BasePowerLineWellheadView();
XCopyUtils.copyObject(input, record);
BasePowerLineWellheadView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePowerLineWellheadViewOutput output = new GetBasePowerLineWellheadViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePowerLineWellheadViewOutput> queryBasePowerLineWellheadView(XContext context, QueryBasePowerLineWellheadViewInput input) {
BasePowerLineWellheadViewMapper mapper = context.getBean(BasePowerLineWellheadViewMapper.class);
BasePowerLineWellheadView record = new BasePowerLineWellheadView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePowerLineWellheadView> list = mapper.selectList(record);
PageInfo<BasePowerLineWellheadView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineWellheadViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineWellheadViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
package pps.core.base.service.data.base_power_line;
import lombok.Data;
import pps.core.base.service.data.base_power_line_diesel.CreateBasePowerLineDieselInput;
import pps.core.base.service.data.base_power_line_plant.CreateBasePowerLinePlantInput;
import pps.core.base.service.data.base_power_line_storage.CreateBasePowerLineStorageInput;
import pps.core.base.service.data.base_power_line_wellhead.CreateBasePowerLineWellheadInput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineInput {
@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;
......@@ -50,124 +42,27 @@ public class CreateBasePowerLineInput {
@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 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;
}
/**
* 输电线路柴发设备配置
*/
@XText("输电线路柴发设备配置")
private List<CreateBasePowerLineDieselInput> dieselInputs;
/**
* 输电线路光伏配置
*/
@XText("输电线路光伏配置")
private List<CreateBasePowerLinePlantInput> plantInputs;
/**
* 输电线路储能配置
*/
@XText("输电线路储能配置")
private List<CreateBasePowerLineStorageInput> storageInputs;
/**
* 输电线路井口配置
*/
@XText("输电线路井口配置")
private List<CreateBasePowerLineWellheadInput> wellheadInputs;
}
......@@ -32,6 +32,9 @@ public class CreateBasePowerLineOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class CreateBasePowerLineOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class DeleteBasePowerLineInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class DeleteBasePowerLineInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class DeleteBasePowerLineOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class DeleteBasePowerLineOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineViewOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineViewOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class GetBasePowerLineInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class GetBasePowerLineInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class GetBasePowerLineOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class GetBasePowerLineOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class GetBasePowerLineViewInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class GetBasePowerLineViewInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class GetBasePowerLineViewOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class GetBasePowerLineViewOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -33,6 +33,9 @@ public class QueryBasePowerLineInput extends XPageInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -123,6 +126,14 @@ public class QueryBasePowerLineInput extends XPageInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -33,6 +33,9 @@ public class QueryBasePowerLineOutput extends XPageInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -123,6 +126,14 @@ public class QueryBasePowerLineOutput extends XPageInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -33,6 +33,9 @@ public class QueryBasePowerLineViewInput extends XPageInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -123,6 +126,14 @@ public class QueryBasePowerLineViewInput extends XPageInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -33,6 +33,9 @@ public class QueryBasePowerLineViewOutput extends XPageInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -123,6 +126,14 @@ public class QueryBasePowerLineViewOutput extends XPageInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class UpdateBasePowerLineInput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class UpdateBasePowerLineInput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
......@@ -32,6 +32,9 @@ public class UpdateBasePowerLineOutput {
@XText("组织机构ID")
private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称")
private String lineName;
......@@ -122,6 +125,14 @@ public class UpdateBasePowerLineOutput {
this.ouId = value;
}
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
......
package pps.core.base.service.data.base_power_line_diesel;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路柴发设备配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineDieselInput {
@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 dieselId;
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 getDieselId() {
return this.dieselId;
}
public void setDieselId(String value) {
this.dieselId = value;
}
}
package pps.core.base.service.data.base_power_line_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路光伏配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLinePlantInput {
@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 plantId;
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 getPlantId() {
return this.plantId;
}
public void setPlantId(String value) {
this.plantId = value;
}
}
package pps.core.base.service.data.base_power_line_storage;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路储能配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineStorageInput {
@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 storageId;
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 getStorageId() {
return this.storageId;
}
public void setStorageId(String value) {
this.storageId = value;
}
}
package pps.core.base.service.data.base_power_line_wellhead;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路井口配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineWellheadInput {
@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 wellheadId;
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 getWellheadId() {
return this.wellheadId;
}
public void setWellheadId(String value) {
this.wellheadId = value;
}
}
......@@ -6,7 +6,6 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
......@@ -18,30 +17,6 @@ import java.util.List;
@Data
public class CreateBasePriceStrategyInput {
@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("策略名称")
private String policyName;
......@@ -60,6 +35,7 @@ public class CreateBasePriceStrategyInput {
/**
* 月份入参
*/
@XText("月份入参")
@Valid
private List<CreateBasePriceStrategyMonthInput> months;
}
package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
/**
* 删除市电峰谷配置入参
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class DeleteBasePriceStrategyInput {
@XText("ID")
private String id;
......@@ -43,109 +53,4 @@ public class DeleteBasePriceStrategyInput {
@XText("固定电价")
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = value;
}
}
package pps.core.base.service.data.base_price_strategy;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
/**
* 市电峰谷配置入参
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class GetBasePriceStrategyInput {
@XText("ID")
@NotBlank
private String id;
@XText("是否删除(0_是;1_否)")
......@@ -43,109 +55,4 @@ public class GetBasePriceStrategyInput {
@XText("固定电价")
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = value;
}
}
package pps.core.base.service.data.base_price_strategy;
import jakarta.validation.Valid;
import lombok.Data;
import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.util.List;
/**
* 市电峰谷配置返回结果
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class GetBasePriceStrategyOutput {
@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("策略名称")
private String policyName;
......@@ -44,108 +34,9 @@ public class GetBasePriceStrategyOutput {
@XText("固定电价")
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = value;
}
/**
* 月份
*/
@Valid
private List<GetBasePriceStrategyMonthOutput> months;
}
package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import xstartup.base.data.XPageInput;
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class QueryBasePriceStrategyViewOutput 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("策略名称")
private String policyName;
......@@ -45,108 +32,11 @@ public class QueryBasePriceStrategyViewOutput extends XPageInput {
@XText("固定电价")
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
/*-----------------------------扩展字段-----------------------------*/
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = value;
}
@XText("是否固定电价")
private String isFixedPriceValue;
@XText("适用地区名")
private String areaName;
}
......@@ -7,7 +7,6 @@ import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrat
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
......@@ -23,27 +22,6 @@ public class UpdateBasePriceStrategyInput {
@NotBlank(message = "缺少策略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("策略名称")
private String policyName;
......@@ -62,6 +40,7 @@ public class UpdateBasePriceStrategyInput {
/**
* 月份入参
*/
@XText("月份入参")
@Valid
private List<UpdateBasePriceStrategyMonthInput> months;
}
......@@ -16,35 +16,9 @@ import java.util.Date;
*/
@Data
public class CreateBasePriceStrategyDetailInput {
@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 strategyId;
@XText("市电峰谷月")
private Integer strategyMonth;;
private Integer strategyMonth;
@XText("时段类型key(字典获取)")
@NotBlank(message = "时段类型不能为空")
......
package pps.core.base.service.data.base_price_strategy_detail;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
/**
* 明细
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class GetBasePriceStrategyDetailOutput {
@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 strategyId;
@XText("市电峰谷月")
private Integer strategyMonth;
......@@ -49,125 +32,4 @@ public class GetBasePriceStrategyDetailOutput {
@XText("内部结算价")
private BigDecimal internalSettlementPrice;
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 getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getStrategyMonth() {
return this.strategyMonth;
}
public void setStrategyMonth(Integer value) {
this.strategyMonth = value;
}
public String getPeriodTypeKey() {
return this.periodTypeKey;
}
public void setPeriodTypeKey(String value) {
this.periodTypeKey = value;
}
public Date getStartTime() {
return this.startTime;
}
public void setStartTime(Date value) {
this.startTime = value;
}
public Date getEndTime() {
return this.endTime;
}
public void setEndTime(Date value) {
this.endTime = value;
}
public BigDecimal getElectrovalence() {
return this.electrovalence;
}
public void setElectrovalence(BigDecimal value) {
this.electrovalence = value;
}
public BigDecimal getInternalSettlementPrice() {
return this.internalSettlementPrice;
}
public void setInternalSettlementPrice(BigDecimal value) {
this.internalSettlementPrice = value;
}
}
......@@ -14,35 +14,6 @@ import java.util.Date;
*/
@Data
public class UpdateBasePriceStrategyDetailInput {
@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 strategyId;
@XText("市电峰谷月")
private Integer strategyMonth;
@XText("时段类型key(字典获取)")
private String periodTypeKey;
......
......@@ -6,7 +6,6 @@ import lombok.Data;
import pps.core.base.service.data.base_price_strategy_detail.CreateBasePriceStrategyDetailInput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
......@@ -17,32 +16,6 @@ import java.util.List;
*/
@Data
public class CreateBasePriceStrategyMonthInput {
@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 strategyId;
@XText("市电峰谷月(1-12)")
@NotNull(message = "月份不能为空")
......@@ -51,6 +24,7 @@ public class CreateBasePriceStrategyMonthInput {
/**
* 策略明细入参
*/
@XText("策略明细入参")
@Valid
private List<CreateBasePriceStrategyDetailInput> details;
}
......@@ -6,7 +6,6 @@ import lombok.Data;
import pps.core.base.service.data.base_price_strategy_detail.UpdateBasePriceStrategyDetailInput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
......@@ -17,32 +16,6 @@ import java.util.List;
*/
@Data
public class UpdateBasePriceStrategyMonthInput {
@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 strategyId;
@XText("市电峰谷月(1-12)")
@NotNull(message = "月份不能为空")
......@@ -51,6 +24,7 @@ public class UpdateBasePriceStrategyMonthInput {
/**
* 策略明细入参
*/
@XText("策略明细入参")
@Valid
private List<UpdateBasePriceStrategyDetailInput> details;
}
package pps.core.base.utils;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.apache.commons.lang3.StringUtils;
import pps.core.base.entity.BaseEnt;
import pps.core.common.session.PpsUserSession;
import java.util.Collection;
import java.util.Date;
/**
* 封装工具类
*
* @author ZWT
* @date 2023/08/25 16:08
*/
public class BaseEntUtils {
/**
* 设置市电峰谷策略默认值
*
* @param entity 实体
* @param session 会话
*/
public static void setBaseEntDefault(BaseEnt entity, PpsUserSession session) {
String id = entity.getId();
Date now = new Date();
String userId = session.getId();
String userName = session.getUserName();
if (StringUtils.isEmpty(id)) {
entity.setCreateById(userId);
entity.setCreateByName(userName);
entity.setCreateTime(now);
}
entity.setModifyById(userId);
entity.setModifyByName(userName);
entity.setModifyTime(now);
}
/**
* 批量插入
*
* @param mapper 映射器
* @param entityClass 实体类
* @param list 列表
*/
public static <E> void batchInsert(Class<?> mapper, Class<?> entityClass, Collection<E> list) {
String sqlStatement = SqlHelper.getSqlStatement(mapper, SqlMethod.INSERT_ONE);
SqlHelper.executeBatch(entityClass, null, list, 1000, (sqlSession, ent) -> {
sqlSession.insert(sqlStatement, ent);
});
}
}
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