feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/StationMappingEnt.java

 package pps.core.middle.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;
@@ -12,14 +13,30 @@ import java.io.Serializable;
 @TableName("STATION_MAPPING")
 public class StationMappingEnt implements Serializable {
     @XText("ID")
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
+    @XText("逆变器ID")
     @TableField
-    private String stationName;
+    private Long inverterId;
 
-    @XText("映射名称")
+    @XText("逆变器名称")
     @TableField
-    private String mappingName;
-}
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    @TableField
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    @TableField
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    @TableField
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    @TableField
+    private String systemStationName;
+}
\ No newline at end of file

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/StationMappingView.java

@@ -12,11 +12,27 @@ public class StationMappingView implements Serializable {
     @TableField
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
+    @XText("逆变器ID")
     @TableField
-    private String stationName;
+    private Long inverterId;
 
-    @XText("映射名称")
+    @XText("逆变器名称")
     @TableField
-    private String mappingName;
-}
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    @TableField
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    @TableField
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    @TableField
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    @TableField
+    private String systemStationName;
+}
\ No newline at end of file

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/WeatherAttachmentRecordEnt.java

+package pps.core.middle.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("WEATHER_ATTACHMENT_RECORD")
+public class WeatherAttachmentRecordEnt implements Serializable {
+    @XText("ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @XText("邮件时间")
+    @TableField
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    @TableField
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    @TableField
+    private String emailName;
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/WeatherAttachmentRecordView.java

+package pps.core.middle.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class WeatherAttachmentRecordView implements Serializable {
+    @XText("ID")
+    @TableField
+    private Long id;
+
+    @XText("邮件时间")
+    @TableField
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    @TableField
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    @TableField
+    private String emailName;
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/WellheadDailyProductionSituationEnt.java

@@ -12,31 +12,67 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-@TableName("wellhead_daily_production_situation")
+@TableName("WELLHEAD_DAILY_PRODUCTION_SITUATION")
 public class WellheadDailyProductionSituationEnt implements Serializable {
     @XText("ID")
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @XText("井口ID")
-    @TableField
-    private String wellheadId;
-
     @XText("井号")
     @TableField
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     @TableField
     private Date dataDate;
 
-    @XText("生产时间(h)")
+    @XText("日耗电量(kW-h)")
     @TableField
-    private BigDecimal productionTime;
+    private BigDecimal powerConsumeDaily;
 
-    @XText("日耗电量(kW-h)")
+    @XText("日市电用电量")
+    @TableField
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    @TableField
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    @TableField
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    @TableField
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
     @TableField
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    @TableField
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    @TableField
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     @TableField
@@ -45,4 +81,8 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
     @XText("来源系统")
     @TableField
     private String systemSource;
+
+    @XText("创建时间")
+    @TableField
+    private Date createDate;
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/WellheadDailyProductionSituationView.java

@@ -14,25 +14,61 @@ public class WellheadDailyProductionSituationView implements Serializable {
     @TableField
     private Long id;
 
-    @XText("井口ID")
-    @TableField
-    private String wellheadId;
-
     @XText("井号")
     @TableField
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     @TableField
     private Date dataDate;
 
-    @XText("生产时间(h)")
+    @XText("日耗电量(kW-h)")
     @TableField
-    private BigDecimal productionTime;
+    private BigDecimal powerConsumeDaily;
 
-    @XText("日耗电量(kW-h)")
+    @XText("日市电用电量")
+    @TableField
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    @TableField
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    @TableField
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    @TableField
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
     @TableField
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    @TableField
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    @TableField
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     @TableField
@@ -41,4 +77,8 @@ public class WellheadDailyProductionSituationView implements Serializable {
     @XText("来源系统")
     @TableField
     private String systemSource;
+
+    @XText("创建时间")
+    @TableField
+    private Date createDate;
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/WeatherAttachmentRecordMapper.java

+package pps.core.middle.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.middle.entity.WeatherAttachmentRecordEnt;
+
+@Repository(value = "pps.core.middle.mapper.WeatherAttachmentRecordMapper")
+public interface WeatherAttachmentRecordMapper extends BaseMapper<WeatherAttachmentRecordEnt> {
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/WeatherAttachmentRecordViewMapper.java

+package pps.core.middle.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.middle.entity.WeatherAttachmentRecordView;
+
+import java.util.List;
+
+@Repository(value = "pps.core.middle.mapper.WeatherAttachmentRecordViewMapper")
+public interface WeatherAttachmentRecordViewMapper {
+    WeatherAttachmentRecordView selectOne(WeatherAttachmentRecordView record);
+
+    List<WeatherAttachmentRecordView> selectList(WeatherAttachmentRecordView record);
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/CreateStationMappingInput.java

@@ -6,34 +6,78 @@ public class CreateStationMappingInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/CreateStationMappingOutput.java

@@ -6,34 +6,78 @@ public class CreateStationMappingOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/DeleteStationMappingInput.java

@@ -6,34 +6,78 @@ public class DeleteStationMappingInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/DeleteStationMappingOutput.java

@@ -6,34 +6,78 @@ public class DeleteStationMappingOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/DynamicQueryStationMappingInput.java

@@ -6,34 +6,78 @@ public class DynamicQueryStationMappingInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/DynamicQueryStationMappingOutput.java

@@ -6,34 +6,78 @@ public class DynamicQueryStationMappingOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/DynamicQueryStationMappingViewOutput.java

@@ -6,34 +6,78 @@ public class DynamicQueryStationMappingViewOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/GetStationMappingInput.java

@@ -6,34 +6,78 @@ public class GetStationMappingInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/GetStationMappingOutput.java

@@ -6,34 +6,78 @@ public class GetStationMappingOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/GetStationMappingViewInput.java

@@ -6,34 +6,78 @@ public class GetStationMappingViewInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/GetStationMappingViewOutput.java

@@ -6,34 +6,78 @@ public class GetStationMappingViewOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/QueryStationMappingInput.java

@@ -7,34 +7,78 @@ public class QueryStationMappingInput extends XPageInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/QueryStationMappingOutput.java

@@ -7,34 +7,78 @@ public class QueryStationMappingOutput extends XPageInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/QueryStationMappingViewInput.java

@@ -7,34 +7,78 @@ public class QueryStationMappingViewInput extends XPageInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/QueryStationMappingViewOutput.java

@@ -7,34 +7,78 @@ public class QueryStationMappingViewOutput extends XPageInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/UpdateStationMappingInput.java

@@ -6,34 +6,78 @@ public class UpdateStationMappingInput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/station_mapping/UpdateStationMappingOutput.java

@@ -6,34 +6,78 @@ public class UpdateStationMappingOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井组名称(线路/光伏电站)")
-    private String stationName;
+    @XText("逆变器ID")
+    private Long inverterId;
 
-    @XText("映射名称")
-    private String mappingName;
+    @XText("逆变器名称")
+    private String inverterName;
 
-    public Long getId() {
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getStationName() {
-        return this.stationName;
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
     }
 
-    public void setStationName(String value) {
-        this.stationName = value;
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
     }
 
-    public String getMappingName() {
-        return this.mappingName;
+    public String getSystemStationName() {
+        return this.systemStationName;
     }
 
-    public void setMappingName(String value) {
-        this.mappingName = value;
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
     }
 
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/CreateWeatherAttachmentRecordInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class CreateWeatherAttachmentRecordInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/CreateWeatherAttachmentRecordOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class CreateWeatherAttachmentRecordOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/DeleteWeatherAttachmentRecordInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class DeleteWeatherAttachmentRecordInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/DeleteWeatherAttachmentRecordOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class DeleteWeatherAttachmentRecordOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/DynamicQueryWeatherAttachmentRecordInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class DynamicQueryWeatherAttachmentRecordInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/DynamicQueryWeatherAttachmentRecordOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class DynamicQueryWeatherAttachmentRecordOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/DynamicQueryWeatherAttachmentRecordViewOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class DynamicQueryWeatherAttachmentRecordViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/GetWeatherAttachmentRecordInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetWeatherAttachmentRecordInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/GetWeatherAttachmentRecordOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetWeatherAttachmentRecordOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/GetWeatherAttachmentRecordViewInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetWeatherAttachmentRecordViewInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/GetWeatherAttachmentRecordViewOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetWeatherAttachmentRecordViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/QueryWeatherAttachmentRecordInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.util.Date;
+
+public class QueryWeatherAttachmentRecordInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/QueryWeatherAttachmentRecordOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.util.Date;
+
+public class QueryWeatherAttachmentRecordOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/QueryWeatherAttachmentRecordViewInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.util.Date;
+
+public class QueryWeatherAttachmentRecordViewInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/QueryWeatherAttachmentRecordViewOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.util.Date;
+
+public class QueryWeatherAttachmentRecordViewOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/UpdateWeatherAttachmentRecordInput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class UpdateWeatherAttachmentRecordInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/weather_attachment_record/UpdateWeatherAttachmentRecordOutput.java

+package pps.core.middle.service.data.weather_attachment_record;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class UpdateWeatherAttachmentRecordOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("邮件时间")
+    private Date emailDataTime;
+
+    @XText("邮件附件下载地址")
+    private String emailAttachmentUrl;
+
+    @XText("邮件名称")
+    private String emailName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Date getEmailDataTime() {
+        return this.emailDataTime;
+    }
+
+    public void setEmailDataTime(Date value) {
+        this.emailDataTime = value;
+    }
+
+    public String getEmailAttachmentUrl() {
+        return this.emailAttachmentUrl;
+    }
+
+    public void setEmailAttachmentUrl(String value) {
+        this.emailAttachmentUrl = value;
+    }
+
+    public String getEmailName() {
+        return this.emailName;
+    }
+
+    public void setEmailName(String value) {
+        this.emailName = value;
+    }
+
+}

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/CreateWellheadDailyProductionSituationInput.java

@@ -9,20 +9,47 @@ public class CreateWellheadDailyProductionSituationInput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class CreateWellheadDailyProductionSituationInput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class CreateWellheadDailyProductionSituationInput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class CreateWellheadDailyProductionSituationInput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/CreateWellheadDailyProductionSituationOutput.java

@@ -5,24 +5,52 @@ import xstartup.annotation.XText;
 import java.math.BigDecimal;
 import java.util.Date;
 
+
 public class CreateWellheadDailyProductionSituationOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +58,17 @@ public class CreateWellheadDailyProductionSituationOutput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +85,100 @@ public class CreateWellheadDailyProductionSituationOutput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
+    }
+
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
+    }
+
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
+    }
+
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +197,12 @@ public class CreateWellheadDailyProductionSituationOutput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/DeleteWellheadDailyProductionSituationInput.java

@@ -9,20 +9,47 @@ public class DeleteWellheadDailyProductionSituationInput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class DeleteWellheadDailyProductionSituationInput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class DeleteWellheadDailyProductionSituationInput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class DeleteWellheadDailyProductionSituationInput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/DeleteWellheadDailyProductionSituationOutput.java

@@ -9,20 +9,47 @@ public class DeleteWellheadDailyProductionSituationOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class DeleteWellheadDailyProductionSituationOutput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class DeleteWellheadDailyProductionSituationOutput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class DeleteWellheadDailyProductionSituationOutput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/DynamicQueryWellheadDailyProductionSituationInput.java

@@ -9,20 +9,47 @@ public class DynamicQueryWellheadDailyProductionSituationInput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class DynamicQueryWellheadDailyProductionSituationInput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class DynamicQueryWellheadDailyProductionSituationInput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class DynamicQueryWellheadDailyProductionSituationInput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/DynamicQueryWellheadDailyProductionSituationOutput.java

@@ -9,20 +9,47 @@ public class DynamicQueryWellheadDailyProductionSituationOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class DynamicQueryWellheadDailyProductionSituationOutput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class DynamicQueryWellheadDailyProductionSituationOutput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class DynamicQueryWellheadDailyProductionSituationOutput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/DynamicQueryWellheadDailyProductionSituationViewOutput.java

@@ -9,20 +9,47 @@ public class DynamicQueryWellheadDailyProductionSituationViewOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class DynamicQueryWellheadDailyProductionSituationViewOutput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class DynamicQueryWellheadDailyProductionSituationViewOutput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class DynamicQueryWellheadDailyProductionSituationViewOutput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/GetWellheadDailyProductionSituationInput.java

@@ -9,20 +9,47 @@ public class GetWellheadDailyProductionSituationInput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class GetWellheadDailyProductionSituationInput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class GetWellheadDailyProductionSituationInput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class GetWellheadDailyProductionSituationInput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/GetWellheadDailyProductionSituationOutput.java

@@ -9,20 +9,47 @@ public class GetWellheadDailyProductionSituationOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class GetWellheadDailyProductionSituationOutput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class GetWellheadDailyProductionSituationOutput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class GetWellheadDailyProductionSituationOutput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/GetWellheadDailyProductionSituationViewInput.java

@@ -9,20 +9,47 @@ public class GetWellheadDailyProductionSituationViewInput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class GetWellheadDailyProductionSituationViewInput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class GetWellheadDailyProductionSituationViewInput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class GetWellheadDailyProductionSituationViewInput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/data/wellhead_daily_production_situation/GetWellheadDailyProductionSituationViewOutput.java

@@ -9,20 +9,47 @@ public class GetWellheadDailyProductionSituationViewOutput {
     @XText("ID")
     private Long id;
 
-    @XText("井口ID")
-    private String wellheadId;
-
     @XText("井号")
     private String wellNumber;
 
-    @XText("日期")
+    @XText("数据日期")
     private Date dataDate;
 
-    @XText("生产时间(h)")
-    private BigDecimal productionTime;
-
     @XText("日耗电量(kW-h)")
-    private BigDecimal dailyElectricityConsumption;
+    private BigDecimal powerConsumeDaily;
+
+    @XText("日市电用电量")
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    private BigDecimal alleyHoursTariff;
+
+    @XText("开井时长(h)")
+    private BigDecimal startHours;
 
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
@@ -30,22 +57,17 @@ public class GetWellheadDailyProductionSituationViewOutput {
     @XText("来源系统")
     private String systemSource;
 
-    public Long getId() {
+    @XText("创建时间")
+    private Date createDate;
+
+    public Long getID() {
         return this.id;
     }
 
-    public void setId(Long value) {
+    public void setID(Long value) {
         this.id = value;
     }
 
-    public String getWellheadId() {
-        return this.wellheadId;
-    }
-
-    public void setWellheadId(String value) {
-        this.wellheadId = value;
-    }
-
     public String getWellNumber() {
         return this.wellNumber;
     }
@@ -62,20 +84,100 @@ public class GetWellheadDailyProductionSituationViewOutput {
         this.dataDate = value;
     }
 
-    public BigDecimal getProductionTime() {
-        return this.productionTime;
+    public BigDecimal getPowerConsumeDaily() {
+        return this.powerConsumeDaily;
+    }
+
+    public void setPowerConsumeDaily(BigDecimal value) {
+        this.powerConsumeDaily = value;
+    }
+
+    public BigDecimal getDailyUtilityElectricityConsumption() {
+        return this.dailyUtilityElectricityConsumption;
+    }
+
+    public void setDailyUtilityElectricityConsumption(BigDecimal value) {
+        this.dailyUtilityElectricityConsumption = value;
+    }
+
+    public BigDecimal getElectricityConsumptionPh() {
+        return this.electricityConsumptionPh;
+    }
+
+    public void setElectricityConsumptionPh(BigDecimal value) {
+        this.electricityConsumptionPh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionHh() {
+        return this.electricityConsumptionHh;
+    }
+
+    public void setElectricityConsumptionHh(BigDecimal value) {
+        this.electricityConsumptionHh = value;
+    }
+
+    public BigDecimal getElectricityConsumptionNp() {
+        return this.electricityConsumptionNp;
+    }
+
+    public void setElectricityConsumptionNp(BigDecimal value) {
+        this.electricityConsumptionNp = value;
+    }
+
+    public BigDecimal getElectricityConsumptionVh() {
+        return this.electricityConsumptionVh;
+    }
+
+    public void setElectricityConsumptionVh(BigDecimal value) {
+        this.electricityConsumptionVh = value;
+    }
+
+    public BigDecimal getElectricityChargeCity() {
+        return this.electricityChargeCity;
+    }
+
+    public void setElectricityChargeCity(BigDecimal value) {
+        this.electricityChargeCity = value;
+    }
+
+    public BigDecimal getElectricityChargesPh() {
+        return this.electricityChargesPh;
     }
 
-    public void setProductionTime(BigDecimal value) {
-        this.productionTime = value;
+    public void setElectricityChargesPh(BigDecimal value) {
+        this.electricityChargesPh = value;
     }
 
-    public BigDecimal getDailyElectricityConsumption() {
-        return this.dailyElectricityConsumption;
+    public BigDecimal getPeakHourTariff() {
+        return this.peakHourTariff;
     }
 
-    public void setDailyElectricityConsumption(BigDecimal value) {
-        this.dailyElectricityConsumption = value;
+    public void setPeakHourTariff(BigDecimal value) {
+        this.peakHourTariff = value;
+    }
+
+    public BigDecimal getNormalPeriodTariff() {
+        return this.normalPeriodTariff;
+    }
+
+    public void setNormalPeriodTariff(BigDecimal value) {
+        this.normalPeriodTariff = value;
+    }
+
+    public BigDecimal getAlleyHoursTariff() {
+        return this.alleyHoursTariff;
+    }
+
+    public void setAlleyHoursTariff(BigDecimal value) {
+        this.alleyHoursTariff = value;
+    }
+
+    public BigDecimal getSTARTHOURS() {
+        return this.startHours;
+    }
+
+    public void setSTARTHOURS(BigDecimal value) {
+        this.startHours = value;
     }
 
     public BigDecimal getDailyLiquidProduction() {
@@ -94,4 +196,12 @@ public class GetWellheadDailyProductionSituationViewOutput {
         this.systemSource = value;
     }
 
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
 }