Skip to content

G
gf_back
Commit 9632c08e authored by luoxiangyang's avatar luoxiangyang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9a995b5b fe1d3f8d
Hide whitespace changes
Inline Side-by-side
Showing with 919 additions and 3571 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseEnt.java 0 → 100644
View file @ 9632c08e
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;
}
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDieselEnt.java
View file @ 9632c08e
package pps.core.base.entity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@TableName("base_power_line_diesel") import java.io.Serializable;
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;
@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") @XText("线路ID")
@TableField @TableField
...@@ -50,85 +24,4 @@ public class BasePowerLineDieselEnt implements Serializable { ...@@ -50,85 +24,4 @@ public class BasePowerLineDieselEnt implements Serializable {
@XText("柴发设备ID") @XText("柴发设备ID")
@TableField @TableField
private String dieselId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDieselView.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路柴发设备配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineDieselView implements Serializable { public class BasePowerLineDieselView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
...@@ -46,85 +54,4 @@ public class BasePowerLineDieselView implements Serializable { ...@@ -46,85 +54,4 @@ public class BasePowerLineDieselView implements Serializable {
@XText("柴发设备ID") @XText("柴发设备ID")
@TableField @TableField
private String dieselId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineEnt.java
View file @ 9632c08e
package pps.core.base.entity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@TableName("base_power_line") import java.io.Serializable;
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;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
@TableName("base_power_line")
public class BasePowerLineEnt extends BaseEnt implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
@XText("上级线路ID")
@TableField
private String upperLineId;
@XText("线路名称") @XText("线路名称")
@TableField @TableField
private String lineName; private String lineName;
...@@ -70,125 +47,4 @@ public class BasePowerLineEnt implements Serializable { ...@@ -70,125 +47,4 @@ public class BasePowerLineEnt implements Serializable {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
@TableField @TableField
private Integer isReverseDispatch; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLinePlantEnt.java
View file @ 9632c08e
package pps.core.base.entity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@TableName("base_power_line_plant") import java.io.Serializable;
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;
@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") @XText("线路ID")
@TableField @TableField
...@@ -50,85 +24,4 @@ public class BasePowerLinePlantEnt implements Serializable { ...@@ -50,85 +24,4 @@ public class BasePowerLinePlantEnt implements Serializable {
@XText("光伏电站ID") @XText("光伏电站ID")
@TableField @TableField
private String plantId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLinePlantView.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路光伏配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLinePlantView implements Serializable { public class BasePowerLinePlantView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
...@@ -46,85 +54,4 @@ public class BasePowerLinePlantView implements Serializable { ...@@ -46,85 +54,4 @@ public class BasePowerLinePlantView implements Serializable {
@XText("光伏电站ID") @XText("光伏电站ID")
@TableField @TableField
private String plantId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorageEnt.java
View file @ 9632c08e
package pps.core.base.entity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@TableName("base_power_line_storage") import java.io.Serializable;
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;
@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") @XText("线路ID")
@TableField @TableField
...@@ -50,85 +24,4 @@ public class BasePowerLineStorageEnt implements Serializable { ...@@ -50,85 +24,4 @@ public class BasePowerLineStorageEnt implements Serializable {
@XText("储能设备ID") @XText("储能设备ID")
@TableField @TableField
private String storageId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorageView.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路储能配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineStorageView implements Serializable { public class BasePowerLineStorageView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
...@@ -46,85 +54,4 @@ public class BasePowerLineStorageView implements Serializable { ...@@ -46,85 +54,4 @@ public class BasePowerLineStorageView implements Serializable {
@XText("储能设备ID") @XText("储能设备ID")
@TableField @TableField
private String storageId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineView.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineView implements Serializable { public class BasePowerLineView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
...@@ -43,6 +51,10 @@ public class BasePowerLineView implements Serializable { ...@@ -43,6 +51,10 @@ public class BasePowerLineView implements Serializable {
@TableField @TableField
private String ouId; private String ouId;
@XText("上级线路ID")
@TableField
private String upperLineId;
@XText("线路名称") @XText("线路名称")
@TableField @TableField
private String lineName; private String lineName;
...@@ -66,125 +78,4 @@ public class BasePowerLineView implements Serializable { ...@@ -66,125 +78,4 @@ public class BasePowerLineView implements Serializable {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
@TableField @TableField
private Integer isReverseDispatch; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadEnt.java
View file @ 9632c08e
package pps.core.base.entity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@TableName("base_power_line_wellhead") import java.io.Serializable;
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;
@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") @XText("线路ID")
@TableField @TableField
...@@ -50,85 +24,4 @@ public class BasePowerLineWellheadEnt implements Serializable { ...@@ -50,85 +24,4 @@ public class BasePowerLineWellheadEnt implements Serializable {
@XText("井口ID") @XText("井口ID")
@TableField @TableField
private String wellheadId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadView.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路井口配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePowerLineWellheadView implements Serializable { public class BasePowerLineWellheadView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
...@@ -46,85 +54,4 @@ public class BasePowerLineWellheadView implements Serializable { ...@@ -46,85 +54,4 @@ public class BasePowerLineWellheadView implements Serializable {
@XText("井口ID") @XText("井口ID")
@TableField @TableField
private String wellheadId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetailEnt.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -19,38 +17,7 @@ import java.util.Date; ...@@ -19,38 +17,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("base_price_strategy_detail") @TableName("base_price_strategy_detail")
public class BasePriceStrategyDetailEnt implements Serializable { public class BasePriceStrategyDetailEnt extends BaseEnt 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;
@XText("市电峰谷配置ID") @XText("市电峰谷配置ID")
@TableField @TableField
...@@ -59,7 +26,6 @@ public class BasePriceStrategyDetailEnt implements Serializable { ...@@ -59,7 +26,6 @@ public class BasePriceStrategyDetailEnt implements Serializable {
@XText("市电峰谷月") @XText("市电峰谷月")
@TableField @TableField
private Integer strategyMonth; private Integer strategyMonth;
;
@XText("时段类型key(字典获取)") @XText("时段类型key(字典获取)")
@TableField @TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyEnt.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* 市电峰谷策略 * 市电峰谷策略
...@@ -19,39 +16,7 @@ import java.util.Date; ...@@ -19,39 +16,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("base_price_strategy") @TableName("base_price_strategy")
public class BasePriceStrategyEnt implements Serializable { public class BasePriceStrategyEnt extends BaseEnt 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;
@XText("策略名称") @XText("策略名称")
@TableField @TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyMonthEnt.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -20,38 +17,7 @@ import java.util.List; ...@@ -20,38 +17,7 @@ import java.util.List;
*/ */
@Data @Data
@TableName("base_price_strategy_month") @TableName("base_price_strategy_month")
public class BasePriceStrategyMonthEnt implements Serializable { public class BasePriceStrategyMonthEnt extends BaseEnt 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;
@XText("市电峰谷配置ID") @XText("市电峰谷配置ID")
@TableField @TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyView.java
View file @ 9632c08e
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; 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 { public class BasePriceStrategyView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
...@@ -59,108 +68,9 @@ public class BasePriceStrategyView implements Serializable { ...@@ -59,108 +68,9 @@ public class BasePriceStrategyView implements Serializable {
@TableField @TableField
private BigDecimal fixedElectricityPrice; 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;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineMapper.java
View file @ 9632c08e
...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePowerLineEnt; 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> { public interface BasePowerLineMapper extends BaseMapper<BasePowerLineEnt> {
} }
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyDetailViewMapper.java
View file @ 9632c08e
package pps.core.base.mapper; package pps.core.base.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyDetailView; import pps.core.base.entity.BasePriceStrategyDetailView;
import pps.core.base.entity.BasePriceStrategyMonthEnt;
import java.util.List; import java.util.List;
...@@ -18,14 +16,4 @@ public interface BasePriceStrategyDetailViewMapper { ...@@ -18,14 +16,4 @@ public interface BasePriceStrategyDetailViewMapper {
BasePriceStrategyDetailView selectOne(BasePriceStrategyDetailView record); BasePriceStrategyDetailView selectOne(BasePriceStrategyDetailView record);
List<BasePriceStrategyDetailView> selectList(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);
} }
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyMonthViewMapper.java
View file @ 9632c08e
package pps.core.base.mapper; package pps.core.base.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyMonthEnt;
import pps.core.base.entity.BasePriceStrategyMonthView; import pps.core.base.entity.BasePriceStrategyMonthView;
import java.util.List; import java.util.List;
...@@ -18,14 +16,4 @@ public interface BasePriceStrategyMonthViewMapper { ...@@ -18,14 +16,4 @@ public interface BasePriceStrategyMonthViewMapper {
BasePriceStrategyMonthView selectOne(BasePriceStrategyMonthView record); BasePriceStrategyMonthView selectOne(BasePriceStrategyMonthView record);
List<BasePriceStrategyMonthView> selectList(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);
} }
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyViewMapper.java
View file @ 9632c08e
package pps.core.base.mapper; package pps.core.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyView; import pps.core.base.entity.BasePriceStrategyView;
import java.util.List; 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 { public interface BasePriceStrategyViewMapper {
BasePriceStrategyView selectOne(BasePriceStrategyView record); BasePriceStrategyView selectOne(BasePriceStrategyView record);
List<BasePriceStrategyView> selectList(BasePriceStrategyView record);
/**
* 列表
*
* @param record 记录
* @return {@link List}<{@link BasePriceStrategyView}>
*/
List<BasePriceStrategyView> selectList(@Param(value = "param") BasePriceStrategyView record);
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineDieselService.java deleted 100644 → 0
View file @ 9a995b5b
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());
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLinePlantService.java deleted 100644 → 0
View file @ 9a995b5b
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());
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ 9632c08e
...@@ -3,11 +3,15 @@ package pps.core.base.service; ...@@ -3,11 +3,15 @@ package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLineEnt; import pps.core.base.entity.*;
import pps.core.base.entity.BasePowerLineView; import pps.core.base.mapper.*;
import pps.core.base.mapper.BasePowerLineMapper;
import pps.core.base.mapper.BasePowerLineViewMapper;
import pps.core.base.service.data.base_power_line.*; 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.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -21,6 +25,7 @@ import xstartup.feature.api.annotation.XApiAnonymous; ...@@ -21,6 +25,7 @@ import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper; import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.util.List; import java.util.List;
...@@ -28,19 +33,76 @@ import java.util.List; ...@@ -28,19 +33,76 @@ import java.util.List;
* 输电线路配置模块 * 输电线路配置模块
* *
* @author ZWT * @author ZWT
* @date 2023/08/24 * @date 2023/08/25
*/ */
@XService @XService
@XText("输电线路配置模块") @XText("输电线路配置模块")
public class BasePowerLineService { public class BasePowerLineService {
/**
* 输电线路配置--新增
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
@XText("输电线路配置--新增")
public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) { public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class); // PpsUserSession session = context.getSession(PpsUserSession.class);
BasePowerLineEnt entity = new BasePowerLineEnt(); PpsUserSession session = new PpsUserSession();
XCopyUtils.copyObject(input, entity); session.setId("123");
mapper.insert(entity); session.setUserName("ceshi");
return XServiceResult.OK; 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 @XApiAnonymous
...@@ -101,6 +163,7 @@ public class BasePowerLineService { ...@@ -101,6 +163,7 @@ public class BasePowerLineService {
.like(BasePowerLineEnt::getModifyByName, input.getModifyByName()) .like(BasePowerLineEnt::getModifyByName, input.getModifyByName())
.eq(BasePowerLineEnt::getModifyTime, input.getModifyTime()) .eq(BasePowerLineEnt::getModifyTime, input.getModifyTime())
.like(BasePowerLineEnt::getOuId, input.getOuId()) .like(BasePowerLineEnt::getOuId, input.getOuId())
.like(BasePowerLineEnt::getUpperLineId, input.getUpperLineId())
.like(BasePowerLineEnt::getLineName, input.getLineName()) .like(BasePowerLineEnt::getLineName, input.getLineName())
.like(BasePowerLineEnt::getGridTypeKey, input.getGridTypeKey()) .like(BasePowerLineEnt::getGridTypeKey, input.getGridTypeKey())
.like(BasePowerLineEnt::getLineTypeKey, input.getLineTypeKey()) .like(BasePowerLineEnt::getLineTypeKey, input.getLineTypeKey())
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineStorageService.java deleted 100644 → 0
View file @ 9a995b5b
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());
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineWellheadService.java deleted 100644 → 0
View file @ 9a995b5b
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());
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 9632c08e
...@@ -4,20 +4,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,20 +4,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.core.base.entity.BasePriceStrategyDetailEnt; import pps.core.base.entity.BasePriceStrategyDetailEnt;
import pps.core.base.entity.BasePriceStrategyEnt; import pps.core.base.entity.BasePriceStrategyEnt;
import pps.core.base.entity.BasePriceStrategyMonthEnt; import pps.core.base.entity.BasePriceStrategyMonthEnt;
import pps.core.base.entity.BasePriceStrategyView; import pps.core.base.entity.BasePriceStrategyView;
import pps.core.base.mapper.*; import pps.core.base.mapper.BasePriceStrategyDetailMapper;
import pps.core.base.mapper.BasePriceStrategyMapper;
import pps.core.base.mapper.BasePriceStrategyMonthMapper;
import pps.core.base.mapper.BasePriceStrategyViewMapper;
import pps.core.base.service.data.base_price_strategy.*; import pps.core.base.service.data.base_price_strategy.*;
import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput; import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput;
import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput; import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput;
import pps.core.base.utils.BaseEntUtils;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult;
import xstartup.data.XPageResult; import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
...@@ -25,13 +33,12 @@ import xstartup.error.XError; ...@@ -25,13 +33,12 @@ import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous; import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* 市电峰谷配置模块 * 市电峰谷配置模块
...@@ -44,7 +51,7 @@ import java.util.Objects; ...@@ -44,7 +51,7 @@ import java.util.Objects;
public class BasePriceStrategyService { public class BasePriceStrategyService {
/** /**
* 创建市电峰谷策略 * 市电峰谷策略--新增
* *
* @param context 上下文 * @param context 上下文
* @param input 输入 * @param input 输入
...@@ -52,7 +59,7 @@ public class BasePriceStrategyService { ...@@ -52,7 +59,7 @@ public class BasePriceStrategyService {
*/ */
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
@XText("创建市电峰谷策略") @XText("市电峰谷策略--新增")
public XServiceResult createBasePriceStrategy(XContext context, CreateBasePriceStrategyInput input) { public XServiceResult createBasePriceStrategy(XContext context, CreateBasePriceStrategyInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class); // PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession(); PpsUserSession session = new PpsUserSession();
...@@ -60,23 +67,23 @@ public class BasePriceStrategyService { ...@@ -60,23 +67,23 @@ public class BasePriceStrategyService {
session.setUserName("ceshi"); session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class); BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
BasePriceStrategyEnt entity = new BasePriceStrategyEnt(); BasePriceStrategyEnt entity = XCopyUtils.copyNewObject(input, BasePriceStrategyEnt.class);
XCopyUtils.copyObject(input, entity); BaseEntUtils.setBaseEntDefault(entity, session);
this.setBasePriceStrategyEntDefault(entity, session);
mapper.insert(entity); mapper.insert(entity);
String strategyId = entity.getId(); String strategyId = entity.getId();
List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths(); List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
if (!inputMonths.isEmpty()) { if (!inputMonths.isEmpty()) {
List<BasePriceStrategyMonthEnt> monthList = new ArrayList<>(16); List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
XCopyUtils.copyList(inputMonths, monthList, BasePriceStrategyMonthEnt.class); BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
this.saveStrategyMonthDetail(context, monthList, strategyId, session); BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
} }
return XServiceResult.OK; return XServiceResult.OK;
}); });
} }
/** /**
* 更新市电峰谷策略 * 市电峰谷策略--修改
* *
* @param context 上下文 * @param context 上下文
* @param input 输入 * @param input 输入
...@@ -84,7 +91,7 @@ public class BasePriceStrategyService { ...@@ -84,7 +91,7 @@ public class BasePriceStrategyService {
*/ */
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
@XText("更新市电峰谷策略") @XText("市电峰谷策略--修改")
public XServiceResult updateBasePriceStrategy(XContext context, UpdateBasePriceStrategyInput input) { public XServiceResult updateBasePriceStrategy(XContext context, UpdateBasePriceStrategyInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class); // PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession(); PpsUserSession session = new PpsUserSession();
...@@ -101,25 +108,35 @@ public class BasePriceStrategyService { ...@@ -101,25 +108,35 @@ public class BasePriceStrategyService {
} }
List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths(); List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
if (!inputMonths.isEmpty()) { if (!inputMonths.isEmpty()) {
List<BasePriceStrategyMonthEnt> monthList = new ArrayList<>(16); List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
XCopyUtils.copyList(inputMonths, monthList, BasePriceStrategyMonthEnt.class); List<Integer> collect = monthList.stream()
.map(BasePriceStrategyMonthEnt::getStrategyMonth)
.collect(Collectors.toList());
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
//删除月信息 //删除月信息
BasePriceStrategyMonthViewMapper monthViewMapper = context.getBean(BasePriceStrategyMonthViewMapper.class); monthMapper.delete(new QueryWrapper<BasePriceStrategyMonthEnt>()
monthViewMapper.deleteBatchByStrategyMonth(strategyId, monthList); .lambda()
.eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId)
.in(BasePriceStrategyMonthEnt::getStrategyMonth, collect)
);
BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
//删除详情 //删除详情
BasePriceStrategyDetailViewMapper detailViewMapper = context.getBean(BasePriceStrategyDetailViewMapper.class); detailMapper.delete(new QueryWrapper<BasePriceStrategyDetailEnt>()
detailViewMapper.deleteBatchByStrategyMonth(strategyId, monthList); .lambda()
this.saveStrategyMonthDetail(context, monthList, strategyId, session); .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId)
.in(BasePriceStrategyDetailEnt::getStrategyMonth, collect)
);
this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
} }
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
this.setBasePriceStrategyEntDefault(entity, session); BaseEntUtils.setBaseEntDefault(entity, session);
mapper.updateById(entity); mapper.updateById(entity);
return XServiceResult.OK; return XServiceResult.OK;
}); });
} }
/** /**
* 删除市电峰谷策略 * 市电峰谷策略--删除
* (如果被引用,则不能删除) * (如果被引用,则不能删除)
* *
* @param context 上下文 * @param context 上下文
...@@ -128,173 +145,162 @@ public class BasePriceStrategyService { ...@@ -128,173 +145,162 @@ public class BasePriceStrategyService {
*/ */
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
@XText("删除市电峰谷策略") @XText("市电峰谷策略--删除")
public XServiceResult deleteBasePriceStrategy(XContext context, DeleteBasePriceStrategyInput input) { public XServiceResult deleteBasePriceStrategy(XContext context, DeleteBasePriceStrategyInput input) {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class); // PpsUserSession session = context.getSession(PpsUserSession.class);
QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>(); PpsUserSession session = new PpsUserSession();
queryWrapper.lambda().eq(BasePriceStrategyEnt::getId, input.getId()); session.setId("123");
BasePriceStrategyEnt entity = mapper.selectOne(queryWrapper); session.setUserName("ceshi");
if (entity == null) { String strategyId = input.getId();
return XServiceResult.error(context, XError.NotFound); //todo: 检查是否被其它功能引用
} return XTransactionHelper.begin(context, () -> {
mapper.deleteById(entity); BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
return XServiceResult.OK; QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePriceStrategyEnt::getId, strategyId);
BasePriceStrategyEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
//删除月数据
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
monthMapper.delete(new QueryWrapper<BasePriceStrategyMonthEnt>()
.lambda()
.eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId));
//删除明细数据
BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
detailMapper.delete(new QueryWrapper<BasePriceStrategyDetailEnt>()
.lambda()
.eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
mapper.deleteById(entity);
return XServiceResult.OK;
});
} }
/**
* 市电峰谷策略--详情
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link GetBasePriceStrategyOutput}>
*/
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
@XText("市电峰谷策略--详情")
public XSingleResult<GetBasePriceStrategyOutput> getBasePriceStrategy(XContext context, GetBasePriceStrategyInput input) { public XSingleResult<GetBasePriceStrategyOutput> getBasePriceStrategy(XContext context, GetBasePriceStrategyInput input) {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class); BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
String strategyId = input.getId();
QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePriceStrategyEnt::getId, input.getId()); queryWrapper.lambda()
.select(BasePriceStrategyEnt::getId,
BasePriceStrategyEnt::getPolicyName,
BasePriceStrategyEnt::getAreaCode,
BasePriceStrategyEnt::getStrategyYear,
BasePriceStrategyEnt::getIsFixedPrice,
BasePriceStrategyEnt::getFixedElectricityPrice)
.eq(BasePriceStrategyEnt::getId, strategyId);
BasePriceStrategyEnt entity = mapper.selectOne(queryWrapper); BasePriceStrategyEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
} }
GetBasePriceStrategyOutput output = new GetBasePriceStrategyOutput(); GetBasePriceStrategyOutput output = XCopyUtils.copyNewObject(entity, GetBasePriceStrategyOutput.class);
XCopyUtils.copyObject(entity, output); //查月份
return XSingleResult.success(output); BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
} List<BasePriceStrategyMonthEnt> monthEntList = monthMapper.selectList(new QueryWrapper<BasePriceStrategyMonthEnt>()
.lambda()
@XApiAnonymous .select(BasePriceStrategyMonthEnt::getId, BasePriceStrategyMonthEnt::getStrategyMonth)
@XApiGet .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId));
public XPageResult<QueryBasePriceStrategyOutput> queryBasePriceStrategy(XContext context, QueryBasePriceStrategyInput input) { if (!monthEntList.isEmpty()) {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class); //查明细
QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>(); BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
queryWrapper.lambda().like(BasePriceStrategyEnt::getId, input.getId()) List<BasePriceStrategyDetailEnt> detailEntList = detailMapper.selectList(new QueryWrapper<BasePriceStrategyDetailEnt>()
.eq(BasePriceStrategyEnt::getIsDeleted, input.getIsDeleted()) .lambda()
.like(BasePriceStrategyEnt::getCreateById, input.getCreateById()) .select(BasePriceStrategyDetailEnt::getStrategyMonth,
.like(BasePriceStrategyEnt::getCreateByName, input.getCreateByName()) BasePriceStrategyDetailEnt::getPeriodTypeKey,
.eq(BasePriceStrategyEnt::getCreateTime, input.getCreateTime()) BasePriceStrategyDetailEnt::getStartTime,
.like(BasePriceStrategyEnt::getModifyById, input.getModifyById()) BasePriceStrategyDetailEnt::getEndTime,
.like(BasePriceStrategyEnt::getModifyByName, input.getModifyByName()) BasePriceStrategyDetailEnt::getElectrovalence,
.eq(BasePriceStrategyEnt::getModifyTime, input.getModifyTime()) BasePriceStrategyDetailEnt::getInternalSettlementPrice)
.like(BasePriceStrategyEnt::getPolicyName, input.getPolicyName()) .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
.like(BasePriceStrategyEnt::getAreaCode, input.getAreaCode()) if (!detailEntList.isEmpty()) {
.eq(BasePriceStrategyEnt::getStrategyYear, input.getStrategyYear()) Map<Integer, List<BasePriceStrategyDetailEnt>> collect = detailEntList.stream()
.eq(BasePriceStrategyEnt::getIsFixedPrice, input.getIsFixedPrice()) .collect(Collectors.groupingBy(BasePriceStrategyDetailEnt::getStrategyMonth));
.eq(BasePriceStrategyEnt::getFixedElectricityPrice, input.getFixedElectricityPrice()); for (BasePriceStrategyMonthEnt monthEnt : monthEntList) {
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePriceStrategyOutput.class); monthEnt.setDetails(collect.get(monthEnt.getStrategyMonth()));
} }
}
@XApiAnonymous List<GetBasePriceStrategyMonthOutput> months = XCopyUtils.copyNewList(monthEntList, GetBasePriceStrategyMonthOutput.class);
@XApiGet output.setMonths(months);
public XPageResult<QueryBasePriceStrategyOutput> dynamicQueryBasePriceStrategy(XContext context, CustomQueryInput input) {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
return XMapperHelper.query(mapper, input, BasePriceStrategyEnt.class, QueryBasePriceStrategyOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePriceStrategyViewOutput> getBasePriceStrategyView(XContext context, GetBasePriceStrategyViewInput input) {
BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class);
BasePriceStrategyView record = new BasePriceStrategyView();
XCopyUtils.copyObject(input, record);
BasePriceStrategyView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
} }
GetBasePriceStrategyViewOutput output = new GetBasePriceStrategyViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output); return XSingleResult.success(output);
} }
/**
* 市电峰谷策略--分页列表
*
* @param context 上下文
* @param input 输入
* @return {@link XPageResult}<{@link QueryBasePriceStrategyViewOutput}>
*/
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
@XText("市电峰谷策略--分页列表")
public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) { public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) {
BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class); BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class);
BasePriceStrategyView record = new BasePriceStrategyView(); BasePriceStrategyView record = XCopyUtils.copyNewObject(input, BasePriceStrategyView.class);
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit()); PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePriceStrategyView> list = mapper.selectList(record); List<BasePriceStrategyView> list = mapper.selectList(record);
PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list); PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class); List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class);
List<GetSysAreaOutput> sysAreaOutputList = this.getSysAreaOutputList(context);
for (QueryBasePriceStrategyViewOutput output : outputs) {
output.setAreaName(sysAreaOutputList.stream()
.filter(area -> StringUtils.equals(output.getAreaCode(), String.valueOf(area.getId())))
.map(GetSysAreaOutput::getName)
.findAny()
.orElse("其他地区"));
}
return XPageResult.success(outputs, input, pageInfo.getTotal()); return XPageResult.success(outputs, input, pageInfo.getTotal());
} }
/*-----------------------------------private-----------------------------------*/ /*-----------------------------------private-----------------------------------*/
/**
* 获得系统输出列表区域
*
* @param context 上下文
* @return {@link List}<{@link GetSysAreaOutput}>
*/
private List<GetSysAreaOutput> getSysAreaOutputList(XContext context) {
SystemAreaService systemAreaService = context.getBean(SystemAreaService.class);
XListResult<GetSysAreaOutput> sysAreaList = systemAreaService.getSysAreaList(context, new GetSysAreaInput());
sysAreaList.throwIfFail();
return sysAreaList.getResult();
}
/** /**
* 保存策略明细 * 保存策略明细
* *
* @param context 上下文 * @param monthMapper 月映射器
* @param monthList 月清单 * @param detailMapper 细节映射器
* @param strategyId 战略id * @param monthList 月清单
* @param session 会话 * @param strategyId 战略id
* @param session 会话
*/ */
private void saveStrategyMonthDetail(XContext context, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) { private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, BasePriceStrategyDetailMapper detailMapper, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
Integer strategyMonth; Integer strategyMonth;
List<BasePriceStrategyDetailEnt> detailList; List<BasePriceStrategyDetailEnt> detailList;
for (BasePriceStrategyMonthEnt monthEnt : monthList) { for (BasePriceStrategyMonthEnt monthEnt : monthList) {
this.setBasePriceStrategyMonthEntDefault(monthEnt, strategyId, session); monthEnt.setStrategyId(strategyId);
BaseEntUtils.setBaseEntDefault(monthEnt, session);
monthMapper.insert(monthEnt); monthMapper.insert(monthEnt);
strategyMonth = monthEnt.getStrategyMonth(); strategyMonth = monthEnt.getStrategyMonth();
detailList = monthEnt.getDetails(); detailList = monthEnt.getDetails();
for (BasePriceStrategyDetailEnt detailEnt : detailList) { for (BasePriceStrategyDetailEnt detailEnt : detailList) {
this.setBasePriceStrategyDetailEntDefault(detailEnt, strategyId, strategyMonth, session); detailEnt.setStrategyId(strategyId);
detailEnt.setStrategyMonth(strategyMonth);
BaseEntUtils.setBaseEntDefault(detailEnt, session);
detailMapper.insert(detailEnt); detailMapper.insert(detailEnt);
} }
} }
} }
/**
* 设置市电峰谷当月明细配置默认值
*
* @param entity 实体
* @param strategyId 战略id
* @param strategyMonth 战略月
* @param session 会话
*/
private void setBasePriceStrategyDetailEntDefault(BasePriceStrategyDetailEnt entity, String strategyId, Integer strategyMonth, PpsUserSession session) {
Date now = new Date();
entity.setStrategyId(strategyId);
entity.setStrategyMonth(strategyMonth);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(now);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
}
/**
* 设置市电峰谷月配置默认值
*
* @param entity 实体
* @param strategyId 战略id
* @param session 会话
*/
private void setBasePriceStrategyMonthEntDefault(BasePriceStrategyMonthEnt entity, String strategyId, PpsUserSession session) {
Date now = new Date();
entity.setStrategyId(strategyId);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(now);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
}
/**
* 设置市电峰谷策略默认值
*
* @param entity 实体
* @param session 会话
*/
private void setBasePriceStrategyEntDefault(BasePriceStrategyEnt 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);
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/CreateBasePowerLineInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_power_line; 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 xstartup.annotation.XText;
import java.util.Date; import java.util.List;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineInput { 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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -50,124 +42,27 @@ public class CreateBasePowerLineInput { ...@@ -50,124 +42,27 @@ public class CreateBasePowerLineInput {
@XText("是否激活返输调度(0_激活;1_关闭)") @XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch; private Integer isReverseDispatch;
public String getId() { /**
return this.id; * 输电线路柴发设备配置
} */
@XText("输电线路柴发设备配置")
public void setId(String value) { private List<CreateBasePowerLineDieselInput> dieselInputs;
this.id = value;
} /**
* 输电线路光伏配置
public Integer getIsDeleted() { */
return this.isDeleted; @XText("输电线路光伏配置")
} private List<CreateBasePowerLinePlantInput> plantInputs;
public void setIsDeleted(Integer value) { /**
this.isDeleted = value; * 输电线路储能配置
} */
@XText("输电线路储能配置")
public String getCreateById() { private List<CreateBasePowerLineStorageInput> storageInputs;
return this.createById;
} /**
* 输电线路井口配置
public void setCreateById(String value) { */
this.createById = value; @XText("输电线路井口配置")
} private List<CreateBasePowerLineWellheadInput> wellheadInputs;
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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/CreateBasePowerLineOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class CreateBasePowerLineOutput { ...@@ -32,6 +32,9 @@ public class CreateBasePowerLineOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class CreateBasePowerLineOutput { ...@@ -122,6 +125,14 @@ public class CreateBasePowerLineOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DeleteBasePowerLineInput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class DeleteBasePowerLineInput { ...@@ -32,6 +32,9 @@ public class DeleteBasePowerLineInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class DeleteBasePowerLineInput { ...@@ -122,6 +125,14 @@ public class DeleteBasePowerLineInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DeleteBasePowerLineOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class DeleteBasePowerLineOutput { ...@@ -32,6 +32,9 @@ public class DeleteBasePowerLineOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class DeleteBasePowerLineOutput { ...@@ -122,6 +125,14 @@ public class DeleteBasePowerLineOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DynamicQueryBasePowerLineInput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineInput { ...@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineInput { ...@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DynamicQueryBasePowerLineOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineOutput { ...@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineOutput { ...@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DynamicQueryBasePowerLineViewOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineViewOutput { ...@@ -32,6 +32,9 @@ public class DynamicQueryBasePowerLineViewOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineViewOutput { ...@@ -122,6 +125,14 @@ public class DynamicQueryBasePowerLineViewOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineInput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class GetBasePowerLineInput { ...@@ -32,6 +32,9 @@ public class GetBasePowerLineInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class GetBasePowerLineInput { ...@@ -122,6 +125,14 @@ public class GetBasePowerLineInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class GetBasePowerLineOutput { ...@@ -32,6 +32,9 @@ public class GetBasePowerLineOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class GetBasePowerLineOutput { ...@@ -122,6 +125,14 @@ public class GetBasePowerLineOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineViewInput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class GetBasePowerLineViewInput { ...@@ -32,6 +32,9 @@ public class GetBasePowerLineViewInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class GetBasePowerLineViewInput { ...@@ -122,6 +125,14 @@ public class GetBasePowerLineViewInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/GetBasePowerLineViewOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class GetBasePowerLineViewOutput { ...@@ -32,6 +32,9 @@ public class GetBasePowerLineViewOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class GetBasePowerLineViewOutput { ...@@ -122,6 +125,14 @@ public class GetBasePowerLineViewOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineInput.java
View file @ 9632c08e
...@@ -33,6 +33,9 @@ public class QueryBasePowerLineInput extends XPageInput { ...@@ -33,6 +33,9 @@ public class QueryBasePowerLineInput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -123,6 +126,14 @@ public class QueryBasePowerLineInput extends XPageInput { ...@@ -123,6 +126,14 @@ public class QueryBasePowerLineInput extends XPageInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineOutput.java
View file @ 9632c08e
...@@ -33,6 +33,9 @@ public class QueryBasePowerLineOutput extends XPageInput { ...@@ -33,6 +33,9 @@ public class QueryBasePowerLineOutput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -123,6 +126,14 @@ public class QueryBasePowerLineOutput extends XPageInput { ...@@ -123,6 +126,14 @@ public class QueryBasePowerLineOutput extends XPageInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineViewInput.java
View file @ 9632c08e
...@@ -33,6 +33,9 @@ public class QueryBasePowerLineViewInput extends XPageInput { ...@@ -33,6 +33,9 @@ public class QueryBasePowerLineViewInput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -123,6 +126,14 @@ public class QueryBasePowerLineViewInput extends XPageInput { ...@@ -123,6 +126,14 @@ public class QueryBasePowerLineViewInput extends XPageInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/QueryBasePowerLineViewOutput.java
View file @ 9632c08e
...@@ -33,6 +33,9 @@ public class QueryBasePowerLineViewOutput extends XPageInput { ...@@ -33,6 +33,9 @@ public class QueryBasePowerLineViewOutput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -123,6 +126,14 @@ public class QueryBasePowerLineViewOutput extends XPageInput { ...@@ -123,6 +126,14 @@ public class QueryBasePowerLineViewOutput extends XPageInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/UpdateBasePowerLineInput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class UpdateBasePowerLineInput { ...@@ -32,6 +32,9 @@ public class UpdateBasePowerLineInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class UpdateBasePowerLineInput { ...@@ -122,6 +125,14 @@ public class UpdateBasePowerLineInput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/UpdateBasePowerLineOutput.java
View file @ 9632c08e
...@@ -32,6 +32,9 @@ public class UpdateBasePowerLineOutput { ...@@ -32,6 +32,9 @@ public class UpdateBasePowerLineOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("上级线路ID")
private String upperLineId;
@XText("线路名称") @XText("线路名称")
private String lineName; private String lineName;
...@@ -122,6 +125,14 @@ public class UpdateBasePowerLineOutput { ...@@ -122,6 +125,14 @@ public class UpdateBasePowerLineOutput {
this.ouId = value; this.ouId = value;
} }
public String getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() { public String getLineName() {
return this.lineName; return this.lineName;
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_diesel/CreateBasePowerLineDieselInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_power_line_diesel; package pps.core.base.service.data.base_power_line_diesel;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路柴发设备配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineDieselInput { 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") @XText("柴发设备ID")
private String dieselId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_plant/CreateBasePowerLinePlantInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_power_line_plant; package pps.core.base.service.data.base_power_line_plant;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路光伏配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLinePlantInput { 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") @XText("光伏电站ID")
private String plantId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_storage/CreateBasePowerLineStorageInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_power_line_storage; package pps.core.base.service.data.base_power_line_storage;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路储能配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineStorageInput { 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") @XText("储能设备ID")
private String storageId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/CreateBasePowerLineWellheadInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_power_line_wellhead; package pps.core.base.service.data.base_power_line_wellhead;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路井口配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class CreateBasePowerLineWellheadInput { 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") @XText("井口ID")
private String wellheadId; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/CreateBasePriceStrategyInput.java
View file @ 9632c08e
...@@ -6,7 +6,6 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat ...@@ -6,7 +6,6 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -18,30 +17,6 @@ import java.util.List; ...@@ -18,30 +17,6 @@ import java.util.List;
@Data @Data
public class CreateBasePriceStrategyInput { 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("策略名称") @XText("策略名称")
private String policyName; private String policyName;
...@@ -60,6 +35,7 @@ public class CreateBasePriceStrategyInput { ...@@ -60,6 +35,7 @@ public class CreateBasePriceStrategyInput {
/** /**
* 月份入参 * 月份入参
*/ */
@XText("月份入参")
@Valid @Valid
private List<CreateBasePriceStrategyMonthInput> months; private List<CreateBasePriceStrategyMonthInput> months;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DeleteBasePriceStrategyInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_price_strategy; package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/**
* 删除市电峰谷配置入参
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class DeleteBasePriceStrategyInput { public class DeleteBasePriceStrategyInput {
@XText("ID") @XText("ID")
private String id; private String id;
...@@ -43,109 +53,4 @@ public class DeleteBasePriceStrategyInput { ...@@ -43,109 +53,4 @@ public class DeleteBasePriceStrategyInput {
@XText("固定电价") @XText("固定电价")
private BigDecimal fixedElectricityPrice; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/GetBasePriceStrategyInput.java
View file @ 9632c08e
package pps.core.base.service.data.base_price_strategy; package pps.core.base.service.data.base_price_strategy;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/**
* 市电峰谷配置入参
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class GetBasePriceStrategyInput { public class GetBasePriceStrategyInput {
@XText("ID") @XText("ID")
@NotBlank
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(0_是;1_否)")
...@@ -43,109 +55,4 @@ public class GetBasePriceStrategyInput { ...@@ -43,109 +55,4 @@ public class GetBasePriceStrategyInput {
@XText("固定电价") @XText("固定电价")
private BigDecimal fixedElectricityPrice; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/GetBasePriceStrategyOutput.java
View file @ 9632c08e
package pps.core.base.service.data.base_price_strategy; 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 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 { public class GetBasePriceStrategyOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("策略名称") @XText("策略名称")
private String policyName; private String policyName;
...@@ -44,108 +34,9 @@ public class GetBasePriceStrategyOutput { ...@@ -44,108 +34,9 @@ public class GetBasePriceStrategyOutput {
@XText("固定电价") @XText("固定电价")
private BigDecimal fixedElectricityPrice; private BigDecimal fixedElectricityPrice;
public String getId() { /**
return this.id; * 月份
} */
@Valid
public void setId(String value) { private List<GetBasePriceStrategyMonthOutput> months;
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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/QueryBasePriceStrategyViewOutput.java
View file @ 9632c08e
package pps.core.base.service.data.base_price_strategy; package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import xstartup.base.data.XPageInput;
import java.math.BigDecimal; import java.math.BigDecimal;
import xstartup.base.data.XPageInput; /**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class QueryBasePriceStrategyViewOutput extends XPageInput { public class QueryBasePriceStrategyViewOutput extends XPageInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("策略名称") @XText("策略名称")
private String policyName; private String policyName;
...@@ -45,108 +32,11 @@ public class QueryBasePriceStrategyViewOutput extends XPageInput { ...@@ -45,108 +32,11 @@ public class QueryBasePriceStrategyViewOutput extends XPageInput {
@XText("固定电价") @XText("固定电价")
private BigDecimal fixedElectricityPrice; 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) { @XText("是否固定电价")
this.fixedElectricityPrice = value; private String isFixedPriceValue;
}
@XText("适用地区名")
private String areaName;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/UpdateBasePriceStrategyInput.java
View file @ 9632c08e
...@@ -7,7 +7,6 @@ import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrat ...@@ -7,7 +7,6 @@ import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrat
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -23,27 +22,6 @@ public class UpdateBasePriceStrategyInput { ...@@ -23,27 +22,6 @@ public class UpdateBasePriceStrategyInput {
@NotBlank(message = "缺少策略ID") @NotBlank(message = "缺少策略ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("策略名称") @XText("策略名称")
private String policyName; private String policyName;
...@@ -62,6 +40,7 @@ public class UpdateBasePriceStrategyInput { ...@@ -62,6 +40,7 @@ public class UpdateBasePriceStrategyInput {
/** /**
* 月份入参 * 月份入参
*/ */
@XText("月份入参")
@Valid @Valid
private List<UpdateBasePriceStrategyMonthInput> months; private List<UpdateBasePriceStrategyMonthInput> months;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/CreateBasePriceStrategyDetailInput.java
View file @ 9632c08e
...@@ -16,35 +16,9 @@ import java.util.Date; ...@@ -16,35 +16,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CreateBasePriceStrategyDetailInput { 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("市电峰谷月") @XText("市电峰谷月")
private Integer strategyMonth;; private Integer strategyMonth;
@XText("时段类型key(字典获取)") @XText("时段类型key(字典获取)")
@NotBlank(message = "时段类型不能为空") @NotBlank(message = "时段类型不能为空")
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailOutput.java
View file @ 9632c08e
package pps.core.base.service.data.base_price_strategy_detail; package pps.core.base.service.data.base_price_strategy_detail;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/**
* 明细
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class GetBasePriceStrategyDetailOutput { 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("市电峰谷月") @XText("市电峰谷月")
private Integer strategyMonth; private Integer strategyMonth;
...@@ -49,125 +32,4 @@ public class GetBasePriceStrategyDetailOutput { ...@@ -49,125 +32,4 @@ public class GetBasePriceStrategyDetailOutput {
@XText("内部结算价") @XText("内部结算价")
private BigDecimal internalSettlementPrice; 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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/UpdateBasePriceStrategyDetailInput.java
View file @ 9632c08e
...@@ -14,35 +14,6 @@ import java.util.Date; ...@@ -14,35 +14,6 @@ import java.util.Date;
*/ */
@Data @Data
public class UpdateBasePriceStrategyDetailInput { 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(字典获取)") @XText("时段类型key(字典获取)")
private String periodTypeKey; private String periodTypeKey;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/CreateBasePriceStrategyMonthInput.java
View file @ 9632c08e
...@@ -6,7 +6,6 @@ import lombok.Data; ...@@ -6,7 +6,6 @@ import lombok.Data;
import pps.core.base.service.data.base_price_strategy_detail.CreateBasePriceStrategyDetailInput; import pps.core.base.service.data.base_price_strategy_detail.CreateBasePriceStrategyDetailInput;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -17,32 +16,6 @@ import java.util.List; ...@@ -17,32 +16,6 @@ import java.util.List;
*/ */
@Data @Data
public class CreateBasePriceStrategyMonthInput { 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)") @XText("市电峰谷月(1-12)")
@NotNull(message = "月份不能为空") @NotNull(message = "月份不能为空")
...@@ -51,6 +24,7 @@ public class CreateBasePriceStrategyMonthInput { ...@@ -51,6 +24,7 @@ public class CreateBasePriceStrategyMonthInput {
/** /**
* 策略明细入参 * 策略明细入参
*/ */
@XText("策略明细入参")
@Valid @Valid
private List<CreateBasePriceStrategyDetailInput> details; private List<CreateBasePriceStrategyDetailInput> details;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/GetBasePriceStrategyMonthOutput.java
View file @ 9632c08e
package pps.core.base.service.data.base_price_strategy_month; package pps.core.base.service.data.base_price_strategy_month;
import jakarta.validation.Valid;
import lombok.Data;
import pps.core.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
/**
* 月份
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class GetBasePriceStrategyMonthOutput { public class GetBasePriceStrategyMonthOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("市电峰谷配置ID")
private String strategyId;
@XText("市电峰谷月(1-12)") @XText("市电峰谷月(1-12)")
private Integer strategyMonth; private Integer strategyMonth;
public String getId() { /**
return this.id; * 明细
} */
@Valid
public void setId(String value) { private List<GetBasePriceStrategyDetailOutput> details;
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;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/UpdateBasePriceStrategyMonthInput.java
View file @ 9632c08e
...@@ -6,7 +6,6 @@ import lombok.Data; ...@@ -6,7 +6,6 @@ import lombok.Data;
import pps.core.base.service.data.base_price_strategy_detail.UpdateBasePriceStrategyDetailInput; import pps.core.base.service.data.base_price_strategy_detail.UpdateBasePriceStrategyDetailInput;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -17,32 +16,6 @@ import java.util.List; ...@@ -17,32 +16,6 @@ import java.util.List;
*/ */
@Data @Data
public class UpdateBasePriceStrategyMonthInput { 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)") @XText("市电峰谷月(1-12)")
@NotNull(message = "月份不能为空") @NotNull(message = "月份不能为空")
...@@ -51,6 +24,7 @@ public class UpdateBasePriceStrategyMonthInput { ...@@ -51,6 +24,7 @@ public class UpdateBasePriceStrategyMonthInput {
/** /**
* 策略明细入参 * 策略明细入参
*/ */
@XText("策略明细入参")
@Valid @Valid
private List<UpdateBasePriceStrategyDetailInput> details; private List<UpdateBasePriceStrategyDetailInput> details;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/utils/BaseEntUtils.java 0 → 100644
View file @ 9632c08e
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);
});
}
}
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineViewMapper.xml
View file @ 9632c08e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePowerLineViewMapper"> <mapper namespace="pps.core.base.mapper.BasePowerLineViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineView">
<id column="id" property="id" jdbcType="VARCHAR" /> <id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER" /> <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR" /> <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR" /> <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE" /> <result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" /> <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR" /> <result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="line_name" property="lineName" jdbcType="VARCHAR" /> <result column="upper_line_id" property="upperLineId" jdbcType="VARCHAR"/>
<result column="grid_type_key" property="gridTypeKey" jdbcType="VARCHAR" /> <result column="line_name" property="lineName" jdbcType="VARCHAR"/>
<result column="line_type_key" property="lineTypeKey" jdbcType="VARCHAR" /> <result column="grid_type_key" property="gridTypeKey" jdbcType="VARCHAR"/>
<result column="strategy_id" property="strategyId" jdbcType="VARCHAR" /> <result column="line_type_key" property="lineTypeKey" jdbcType="VARCHAR"/>
<result column="is_share_dispatch" property="isShareDispatch" jdbcType="INTEGER" /> <result column="strategy_id" property="strategyId" jdbcType="VARCHAR"/>
<result column="is_reverse_dispatch" property="isReverseDispatch" jdbcType="INTEGER" /> <result column="is_share_dispatch" property="isShareDispatch" jdbcType="INTEGER"/>
</resultMap> <result column="is_reverse_dispatch" property="isReverseDispatch" jdbcType="INTEGER"/>
<sql id="Base_Column_List"> </resultMap>
id, <sql id="Base_Column_List">
id
,
is_deleted, is_deleted,
create_by_id, create_by_id,
create_by_name, create_by_name,
...@@ -28,25 +30,26 @@ ...@@ -28,25 +30,26 @@
modify_by_name, modify_by_name,
modify_time, modify_time,
ou_id, ou_id,
upper_line_id,
line_name, line_name,
grid_type_key, grid_type_key,
line_type_key, line_type_key,
strategy_id, strategy_id,
is_share_dispatch, is_share_dispatch,
is_reverse_dispatch is_reverse_dispatch
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="BaseResultMap"> <select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from base_power_line from base_power_line
where where
id=#{id} id=#{id}
</select> </select>
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="BaseResultMap"> <select id="selectList" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from base_power_line from base_power_line
where where
id=#{id} id=#{id}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyDetailViewMapper.xml
View file @ 9632c08e
...@@ -50,14 +50,4 @@ ...@@ -50,14 +50,4 @@
where where
id=#{id} id=#{id}
</select> </select>
<delete id="deleteBatchByStrategyMonth">
DELETE
FROM base_price_strategy_detail
WHERE strategy_id = #{strategyId}
AND strategy_month IN
<foreach collection="monthList" open="(" close=")" item="item" separator=",">
#{item.strategyMonth}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyMonthViewMapper.xml
View file @ 9632c08e
...@@ -40,14 +40,4 @@ ...@@ -40,14 +40,4 @@
where where
id=#{id} id=#{id}
</select> </select>
<delete id="deleteBatchByStrategyMonth">
DELETE
FROM base_price_strategy_month
WHERE strategy_id = #{strategyId}
AND strategy_month IN
<foreach collection="monthList" open="(" close=")" item="item" separator=",">
#{item.strategyMonth}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyViewMapper.xml
View file @ 9632c08e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePriceStrategyViewMapper"> <mapper namespace="pps.core.base.mapper.BasePriceStrategyViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePriceStrategyView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.BasePriceStrategyView">
<id column="id" property="id" jdbcType="VARCHAR" /> <id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER" /> <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR" /> <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR" /> <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE" /> <result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" /> <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
<result column="policy_name" property="policyName" jdbcType="VARCHAR" /> <result column="policy_name" property="policyName" jdbcType="VARCHAR"/>
<result column="area_code" property="areaCode" jdbcType="VARCHAR" /> <result column="area_code" property="areaCode" jdbcType="VARCHAR"/>
<result column="strategy_year" property="strategyYear" jdbcType="INTEGER" /> <result column="strategy_year" property="strategyYear" jdbcType="INTEGER"/>
<result column="is_fixed_price" property="isFixedPrice" jdbcType="INTEGER" /> <result column="is_fixed_price" property="isFixedPrice" jdbcType="INTEGER"/>
<result column="fixed_electricity_price" property="fixedElectricityPrice" jdbcType="DECIMAL" /> <result column="fixed_electricity_price" property="fixedElectricityPrice" jdbcType="DECIMAL"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, id
,
is_deleted, is_deleted,
create_by_id, create_by_id,
create_by_name, create_by_name,
...@@ -30,19 +31,38 @@ ...@@ -30,19 +31,38 @@
strategy_year, strategy_year,
is_fixed_price, is_fixed_price,
fixed_electricity_price fixed_electricity_price
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="BaseResultMap"> <select id="selectOne" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from base_price_strategy from base_price_strategy
where where
id=#{id} id=#{id}
</select> </select>
<select id="selectList" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="BaseResultMap">
select <resultMap id="ExtendResultMap" type="pps.core.base.entity.BasePriceStrategyView" extends="BaseResultMap">
<include refid="Base_Column_List" /> <result column="is_fixed_price_value" property="isFixedPriceValue" jdbcType="VARCHAR"/>
from base_price_strategy </resultMap>
where
id=#{id} <select id="selectList" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="ExtendResultMap">
</select> SELECT id,
policy_name,
area_code,
strategy_year,
is_fixed_price,
fixed_electricity_price,
CASE
is_fixed_price
WHEN 0 THEN
'是'
ELSE '否'
END is_fixed_price_value
FROM base_price_strategy
<where>
<if test=" param.policyName != null and param.policyName != '' ">
policy_name LIKE CONCAT( '%', #{param.policyName}, '%' )
</if>
</where>
ORDER BY modify_time DESC
</select>
</mapper> </mapper>
\ No newline at end of file
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