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

1.开发中短期间开优化模块-中短期优化详情接口,完成接口冒烟测试并生成接口文档;
2.开发间开优化历史模块-优化历史分页列表接口,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseDieselGeneratorEnt.java

 package pps.core.base.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+
+/**
+ * 柴发设备
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @Data
 @TableName("base_diesel_generator")
-public class BaseDieselGeneratorEnt implements Serializable {
-    @XText("ID")
-    @TableId(type = IdType.ASSIGN_UUID)
-    private String id;
-
-    @XText("是否删除(1_是;0_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BaseDieselGeneratorEnt extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField
@@ -76,5 +50,4 @@ public class BaseDieselGeneratorEnt implements Serializable {
     @XText("备用功率(KW)")
     @TableField
     private BigDecimal standbyPower;
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseDieselGeneratorView.java

@@ -2,44 +2,20 @@ package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
-@Data
-public class BaseDieselGeneratorView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
 
-    @XText("是否删除(1_是;0_否)")
-    @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/09/08
+ */
+@Data
+public class BaseDieselGeneratorView extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField
@@ -72,5 +48,4 @@ public class BaseDieselGeneratorView implements Serializable {
     @XText("备用功率(KW)")
     @TableField
     private BigDecimal standbyPower;
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseEnergyStorageDeviceEnt.java

 package pps.core.base.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+
+/**
+ * 储能设备
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @Data
 @TableName("base_energy_storage_device")
-public class BaseEnergyStorageDeviceEnt implements Serializable {
-    @XText("ID")
-    @TableId(type = IdType.ASSIGN_UUID)
-    private String id;
-
-    @XText("是否删除(1_是;0_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BaseEnergyStorageDeviceEnt extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseEnergyStorageDeviceView.java

@@ -2,44 +2,20 @@ package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
-@Data
-public class BaseEnergyStorageDeviceView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(1_是;0_否)")
-    @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/09/08
+ */
+@Data
+public class BaseEnergyStorageDeviceView extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePhotovoltaicPlantEnt.java

 package pps.core.base.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
+/**
+ * 光伏电站
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @Data
 @TableName("base_photovoltaic_plant")
-public class BasePhotovoltaicPlantEnt implements Serializable {
-    @XText("ID")
-    @TableId(type = IdType.ASSIGN_UUID)
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePhotovoltaicPlantEnt extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePhotovoltaicPlantView.java

@@ -2,45 +2,20 @@ package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
+/**
+ * 光伏电站
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @Data
-public class BasePhotovoltaicPlantView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePhotovoltaicPlantView extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField
@@ -84,5 +59,4 @@ public class BasePhotovoltaicPlantView implements Serializable {
     @XText("所属省份")
     @TableField(exist = false)
     private String provinceCode;
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDieselView.java

@@ -5,11 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 输电线路柴发设备配置
@@ -21,38 +21,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class BasePowerLineDieselView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePowerLineDieselView extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLinePlantView.java

@@ -5,11 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 输电线路光伏配置
@@ -21,38 +21,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class BasePowerLinePlantView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePowerLinePlantView extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorageView.java

@@ -5,11 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 输电线路储能配置
@@ -21,38 +21,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class BasePowerLineStorageView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePowerLineStorageView extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineView.java

@@ -5,10 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,38 +21,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class BasePowerLineView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePowerLineView extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetailView.java

@@ -2,45 +2,20 @@ package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
+/**
+ * 市电峰谷当月明细配置
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @Data
-public class BasePriceStrategyDetailView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePriceStrategyDetailView extends BaseModel implements Serializable {
 
     @XText("市电峰谷配置ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyMonthView.java

@@ -2,44 +2,19 @@ package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
-import java.util.Date;
 
+/**
+ * 市电峰谷月配置表
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @Data
-public class BasePriceStrategyMonthView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePriceStrategyMonthView extends BaseModel implements Serializable {
 
     @XText("市电峰谷配置ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyView.java

@@ -2,11 +2,11 @@ package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 市电峰谷策略
@@ -15,38 +15,7 @@ import java.util.Date;
  * @date 2023/08/25
  */
 @Data
-public class BasePriceStrategyView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePriceStrategyView extends BaseModel implements Serializable {
 
     @XText("策略名称")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWellheadEnt.java

 package pps.core.base.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
+/**
+ * 井口配置表
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
+@Data
 @TableName("base_wellhead")
-public class BaseWellheadEnt implements Serializable {
-    @XText("ID")
-    @TableId(type = IdType.ASSIGN_UUID)
-    private String id;
-
-    @XText("是否删除(1_是；0_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BaseWellheadEnt extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField
     private String ouId;
+
     @XText("组织机构名称")
     @TableField
     private String ouName;
@@ -66,116 +42,4 @@ public class BaseWellheadEnt implements Serializable {
     @XText("运行功率(KW)")
     @TableField
     private BigDecimal serviceRating;
-
-    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 getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public String getRunTypeKey() {
-        return this.runTypeKey;
-    }
-
-    public void setRunTypeKey(String value) {
-        this.runTypeKey = value;
-    }
-
-    public BigDecimal getServiceRating() {
-        return this.serviceRating;
-    }
-
-    public void setServiceRating(BigDecimal value) {
-        this.serviceRating = value;
-    }
-
-    public String getOuName() {
-        return ouName;
-    }
-
-    public void setOuName(String ouName) {
-        this.ouName = ouName;
-    }
-
-    public String getRunTypeName() {
-        return runTypeName;
-    }
-
-    public void setRunTypeName(String runTypeName) {
-        this.runTypeName = runTypeName;
-    }
 }

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWellheadView.java

 package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class BaseWellheadView implements Serializable {
+/**
+ * 井口配置表
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
+public class BaseWellheadView extends BaseModel implements Serializable {
     @XText("ID")
     @TableField
     private String id;

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDieselGeneratorService.java

@@ -3,12 +3,12 @@ package pps.core.base.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
 import pps.core.base.service.data.base_diesel_generator.*;
-import pps.core.base.utils.SessionSimulation;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -22,18 +22,16 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
-import java.util.Date;
 import java.util.List;
 
 /**
- * @Author luoxiangyang
- * @Description: 柴发设备
- * @Date 2023/8/25
- **/
+ * 柴发设备模块
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @XService
 public class BaseDieselGeneratorService extends BaseService {
-    //todo 模拟登陆
-    private final PpsUserSession session = SessionSimulation.getSession();
 
     @XText("新增")
     @XApiAnonymous
@@ -42,12 +40,8 @@ public class BaseDieselGeneratorService extends BaseService {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         BaseDieselGeneratorEnt entity = new BaseDieselGeneratorEnt();
         XCopyUtils.copyObject(input, entity);
-        entity.setCreateById(session.getId());
-        entity.setCreateByName(session.getUserName());
-        entity.setCreateTime(new Date());
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.insert(entity);
         return XServiceResult.OK;
     }
@@ -60,15 +54,14 @@ public class BaseDieselGeneratorService extends BaseService {
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE);
         BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
@@ -81,17 +74,16 @@ public class BaseDieselGeneratorService extends BaseService {
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE);
         BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         entity = new BaseDieselGeneratorEnt();
         entity.setId(input.getId());
-        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        entity.setIsDeleted(BusinessConstant.ZERO);
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
@@ -104,7 +96,7 @@ public class BaseDieselGeneratorService extends BaseService {
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE);
         BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -127,7 +119,7 @@ public class BaseDieselGeneratorService extends BaseService {
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_diesel w WHERE w.ou_id = {0} AND base_diesel_generator.id = w.diesel_id", input.getOuId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE)
                 .in(CollUtil.isNotEmpty(allListByOuId), BaseDieselGeneratorEnt::getOuId, allListByOuId)
                 .like(StrUtil.isNotEmpty(ouName), BaseDieselGeneratorEnt::getOuName, ouName)
                 .like(StrUtil.isNotEmpty(deviceName), BaseDieselGeneratorEnt::getDeviceName, deviceName)

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEnergyStorageDeviceService.java

@@ -3,12 +3,12 @@ package pps.core.base.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseEnergyStorageDeviceEnt;
 import pps.core.base.mapper.BaseEnergyStorageDeviceMapper;
 import pps.core.base.service.data.base_energy_storage_device.*;
-import pps.core.base.utils.SessionSimulation;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -22,18 +22,16 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
-import java.util.Date;
 import java.util.List;
 
 /**
- * @Author luoxiangyang
- * @Description: 储能设备
- * @Date 2023/8/25
- **/
+ * 储能设备模块
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @XService
 public class BaseEnergyStorageDeviceService extends BaseService {
-    //todo 模拟登陆
-    private final PpsUserSession session = SessionSimulation.getSession();
 
     @XText("新增")
     @XApiAnonymous
@@ -42,12 +40,8 @@ public class BaseEnergyStorageDeviceService extends BaseService {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         BaseEnergyStorageDeviceEnt entity = new BaseEnergyStorageDeviceEnt();
         XCopyUtils.copyObject(input, entity);
-        entity.setCreateById(session.getId());
-        entity.setCreateByName(session.getUserName());
-        entity.setCreateTime(new Date());
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.insert(entity);
         return XServiceResult.OK;
     }
@@ -60,15 +54,14 @@ public class BaseEnergyStorageDeviceService extends BaseService {
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseEnergyStorageDeviceEnt::getId, input.getId())
-                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted,ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE);
         BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
@@ -81,17 +74,16 @@ public class BaseEnergyStorageDeviceService extends BaseService {
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseEnergyStorageDeviceEnt::getId, input.getId())
-                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE);
         BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         entity = new BaseEnergyStorageDeviceEnt();
         entity.setId(input.getId());
-        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        entity.setIsDeleted(BusinessConstant.ZERO);
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
@@ -104,7 +96,7 @@ public class BaseEnergyStorageDeviceService extends BaseService {
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseEnergyStorageDeviceEnt::getId, input.getId())
-                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE);
         BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -127,10 +119,10 @@ public class BaseEnergyStorageDeviceService extends BaseService {
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_storage w WHERE w.ou_id = {0} AND base_energy_storage_device.id = w.storage_id", input.getOuId())
-                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE)
                 .in(CollUtil.isNotEmpty(allListByOuId), BaseEnergyStorageDeviceEnt::getOuId, allListByOuId)
-                .like(StrUtil.isNotEmpty(ouName),BaseEnergyStorageDeviceEnt::getOuName, ouName)
-                .like(StrUtil.isNotEmpty(deviceName),BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
+                .like(StrUtil.isNotEmpty(ouName), BaseEnergyStorageDeviceEnt::getOuName, ouName)
+                .like(StrUtil.isNotEmpty(deviceName), BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
                 .orderByDesc(BaseEnergyStorageDeviceEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEnergyStorageDeviceOutput.class);
     }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java

@@ -3,13 +3,13 @@ package pps.core.base.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.mapper.BasePhotovoltaicPlantMapper;
 import pps.core.base.service.data.base_photovoltaic_plant.*;
-import pps.core.base.utils.SessionSimulation;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import pps.core.system.constant.SysOrganizationCode;
 import pps.core.system.entity.SysOrganizationView;
 import pps.core.system.mapper.SysOrganizationViewMapper;
@@ -28,18 +28,17 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
-import java.util.Date;
 import java.util.List;
 
+
 /**
- * @Author luoxiangyang
- * @Description: 光伏电站配置
- * @Date 2023/8/24
- **/
+ * 光伏电站模块
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @XService
-public class BasePhotovoltaicPlantService extends BaseService{
-    //todo 模拟登陆
-    private final PpsUserSession session = SessionSimulation.getSession();
+public class BasePhotovoltaicPlantService extends BaseService {
 
     @XText("新增")
     @XApiAnonymous
@@ -48,15 +47,12 @@ public class BasePhotovoltaicPlantService extends BaseService{
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         BasePhotovoltaicPlantEnt entity = new BasePhotovoltaicPlantEnt();
         XCopyUtils.copyObject(input, entity);
-        entity.setCreateById(session.getId());
-        entity.setCreateByName(session.getUserName());
-        entity.setCreateTime(new Date());
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.insert(entity);
         return XServiceResult.OK;
     }
+
     @XText("更新")
     @XApiAnonymous
     @XApiPost
@@ -65,18 +61,18 @@ public class BasePhotovoltaicPlantService extends BaseService{
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BasePhotovoltaicPlantEnt::getId, input.getId())
-                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE);
         BasePhotovoltaicPlantEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
+
     @XText("删除")
     @XApiAnonymous
     @XApiPost
@@ -85,21 +81,20 @@ public class BasePhotovoltaicPlantService extends BaseService{
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BasePhotovoltaicPlantEnt::getId, input.getId())
-                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE);
         BasePhotovoltaicPlantEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         entity = new BasePhotovoltaicPlantEnt();
         entity.setId(input.getId());
-        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
-        //PpsUserSession session = context.getSession(PpsUserSession.class);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        entity.setIsDeleted(BusinessConstant.ZERO);
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
+
     @XText("根据id获取详情")
     @XApiAnonymous
     @XApiGet
@@ -108,7 +103,7 @@ public class BasePhotovoltaicPlantService extends BaseService{
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BasePhotovoltaicPlantEnt::getId, input.getId())
-                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE);
         BasePhotovoltaicPlantEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -120,10 +115,11 @@ public class BasePhotovoltaicPlantService extends BaseService{
         SysOrganizationView organizationView = new SysOrganizationView();
         organizationView.setId(entity.getOuId());
         organizationView = organizationViewMapper.selectOrgProvince(organizationView);
-        if(null != organizationView)
+        if (null != organizationView)
             output.setProvince(organizationView.getProvinceName());
         return XSingleResult.success(output);
     }
+
     @XText("分页查询")
     @XApiAnonymous
     @XApiGet
@@ -136,9 +132,9 @@ public class BasePhotovoltaicPlantService extends BaseService{
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_plant w WHERE w.ou_id = {0} AND base_photovoltaic_plant.id = w.plant_id", input.getOuId())
-                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
                 .in(CollUtil.isNotEmpty(allListByOuId), BasePhotovoltaicPlantEnt::getOuId, allListByOuId)
-                .like(StrUtil.isNotEmpty(stationName),BasePhotovoltaicPlantEnt::getStationName,stationName )
+                .like(StrUtil.isNotEmpty(stationName), BasePhotovoltaicPlantEnt::getStationName, stationName)
                 .orderByDesc(BasePhotovoltaicPlantEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);
     }
@@ -170,9 +166,9 @@ public class BasePhotovoltaicPlantService extends BaseService{
             ouId = input.getParentOuId();
             viewList = mapper.selectOuSonByParentOuId(record);
         }
-        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId , ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted , 0);
+        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, 0);
         List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper);
-        plantList.forEach(item->{
+        plantList.forEach(item -> {
             SysOrganizationView view = new SysOrganizationView();
             view.setId(item.getId());
             view.setOuName(item.getStationName());

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java

@@ -149,9 +149,9 @@ public class BasePowerLineService {
     public XSingleResult<GetBasePowerLineViewOutput> getBasePowerLineView(XContext context, GetBasePowerLineInput input) {
         String lineId = input.getId();
         BasePowerLineViewMapper mapper = context.getBean(BasePowerLineViewMapper.class);
-        BasePowerLineView entity = mapper.selectOne(BasePowerLineView.builder()
-                .id(lineId)
-                .build());
+        BasePowerLineView basePowerLineView = new BasePowerLineView();
+        basePowerLineView.setId(lineId);
+        BasePowerLineView entity = mapper.selectOne(basePowerLineView);
         if (Objects.isNull(entity)) {
             return XSingleResult.error(context, XError.NotFound);
         }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWellheadService.java

@@ -2,12 +2,12 @@ package pps.core.base.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseWellheadEnt;
 import pps.core.base.mapper.BaseWellheadMapper;
 import pps.core.base.service.data.base_wellhead.*;
-import pps.core.base.utils.SessionSimulation;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -21,18 +21,17 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
-import java.util.Date;
 import java.util.List;
 
+
 /**
- * @Author luoxiangyang
- * @Description: 井口配置
- * @Date 2023/8/24
- **/
+ * 井口配置模块
+ *
+ * @author ZWT
+ * @date 2023/09/08
+ */
 @XService
 public class BaseWellheadService extends BaseService {
-    //todo 模拟登陆
-    private final PpsUserSession session = SessionSimulation.getSession();
 
     @XText("新增")
     @XApiAnonymous
@@ -41,13 +40,8 @@ public class BaseWellheadService extends BaseService {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         BaseWellheadEnt entity = new BaseWellheadEnt();
         XCopyUtils.copyObject(input, entity);
-        //PpsUserSession session = context.getSession(PpsUserSession.class);
-        entity.setCreateById(session.getId());
-        entity.setCreateByName(session.getUserName());
-        entity.setCreateTime(new Date());
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.insert(entity);
         return XServiceResult.OK;
     }
@@ -64,10 +58,8 @@ public class BaseWellheadService extends BaseService {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
-        //PpsUserSession session = context.getSession(PpsUserSession.class);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
@@ -85,11 +77,9 @@ public class BaseWellheadService extends BaseService {
         }
         entity = new BaseWellheadEnt();
         entity.setId(input.getId());
-        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
-        //PpsUserSession session = context.getSession(PpsUserSession.class);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getUserName());
-        entity.setModifyTime(new Date());
+        entity.setIsDeleted(BusinessConstant.ZERO);
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        BaseUtils.setBaseModelDefault(entity, session);
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
@@ -102,7 +92,7 @@ public class BaseWellheadService extends BaseService {
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .eq(BaseWellheadEnt::getId, input.getId())
-                .eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
+                .eq(BaseWellheadEnt::getIsDeleted, BusinessConstant.ONE);
         BaseWellheadEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -122,8 +112,8 @@ public class BaseWellheadService extends BaseService {
         List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_wellhead w WHERE w.ou_id = {0} AND base_wellhead.id = w.wellhead_id", input.getOuId())
-                .eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
-                .in(CollUtil.isNotEmpty(allListByOuId),BaseWellheadEnt::getOuId, allListByOuId)
+                .eq(BaseWellheadEnt::getIsDeleted, BusinessConstant.ONE)
+                .in(CollUtil.isNotEmpty(allListByOuId), BaseWellheadEnt::getOuId, allListByOuId)
                 .orderByDesc(BaseWellheadEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseWellheadOutput.class);
     }

C09-base/pps-core-base/src/main/java/pps/core/base/utils/SessionSimulation.java

-package pps.core.base.utils;
-
-import pps.core.common.session.PpsUserSession;
-
-/**
- * @Description 模拟
- * @Author luoxiangyang
- * @Date 2023/8/24 16:32
- **/
-public class SessionSimulation {
-    public static PpsUserSession getSession (){
-        PpsUserSession session = new PpsUserSession();
-        session.setId("123");
-        session.setUserName("ceshi");
-        return session;
-    }
-}