feat(吉林演示): 松原

1.修改实际功率数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;
2.修改实际井口状态数据获取定时任务功能,修改定时配置,增加接入吉林实际井口状态数据逻辑,完成功能验证;
3.修改天气数据接收处理定时任务功能,在光伏数据处理完成插入后,添加预测功能远程调用逻辑,完成功能验证;
4.开发光伏预测结果集训练定时任务,完成定时任务配置及功能验证;
5.修改井场日累计数据数据获取定时任务功能,修改定时配置,增加接入吉林实际发电量数据逻辑,完成功能验证;
6.修改光伏电站日累计发电量数据数据获取定时任务功能,修改定时配置,增加接入吉林实际发电量数据逻辑,完成功能验证;
7.修改单井平均发电量数据数据获取定时任务功能,修改定时配置,增加接入吉林实际发电量数据逻辑,完成功能验证;
8.修改井口日累计生产数据数据获取定时任务功能,修改定时配置,增加接入吉林实际井口日累计数据逻辑,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationEnt.java

@@ -57,4 +57,44 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
     @XText("来源系统")
     @TableField
     private String systemSource;
+
+    @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 normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    @TableField
+    private BigDecimal alleyHoursTariff;
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationView.java

@@ -54,6 +54,46 @@ public class WellheadDailyProductionSituationView implements Serializable {
     @TableField
     private String systemSource;
 
+    @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 normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    @TableField
+    private BigDecimal alleyHoursTariff;
+
     /*------------------------ exist ------------------------*/
 
     @XText("线路ID")

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PlantPredictedPowerCloudServiceImpl.java

@@ -2,10 +2,14 @@ package pps.core.prediction.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
 import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
+import pps.cloud.middle.service.IWellDailyProductionSituationCloudService;
+import pps.cloud.middle.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationInput;
+import pps.cloud.middle.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationOutput;
 import pps.cloud.prediction.service.IPlantPredictedPowerCloudService;
 import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput;
 import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
@@ -26,6 +30,7 @@ import xstartup.data.XListResult;
 import xstartup.data.XServiceResult;
 import xstartup.helper.XTransactionHelper;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -168,18 +173,32 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
      */
     @Override
     public XServiceResult wellTechDailyJob(XContext context) {
+        List<WellheadDailyProductionSituationJob> list;
+        //区分环境
         String oilFieldCode = ServiceUtil.getOilFieldCode(context);
-        String token = ServiceUtil.getToken(context);
-        HttpRequestClient client = new HttpRequestClient(token);
-        Map<String, Object> param = new HashMap<>(4);
-        param.put("Calc_Date", DateUtil.yesterday().toString(BusinessConstant.DATE_FORMAT_DAY));
-        String url = XStartup.getCurrent().getProperty("third-party.chang-qing.url");
-        url += ThirdPartyApiConstant.CQ_WELL_TECH_DAILY;
-        String resultStr = client.doPostForm(url, param);
-        context.getLogger().info("*** CQ_WELL_TECH_DAILY : {}", resultStr);
-        JSONObject jsonObject = JSON.parseObject(resultStr);
-        String data = jsonObject.getString("data");
-        List<WellheadDailyProductionSituationJob> list = JSON.parseArray(data, WellheadDailyProductionSituationJob.class);
+        switch (oilFieldCode) {
+            case BusinessConstant.ENV_SY:
+                IWellDailyProductionSituationCloudService service = context.getBean(IWellDailyProductionSituationCloudService.class);
+                XListResult<GetWellheadDailyProductionSituationOutput> result = service.getWellDailyProductionSituationList(context, new GetWellheadDailyProductionSituationInput());
+                result.throwIfFail();
+                list = XCopyUtils.copyNewList(result.getResult(), WellheadDailyProductionSituationJob.class);
+                break;
+            case BusinessConstant.ENV_CQ:
+                String token = ServiceUtil.getToken(context);
+                HttpRequestClient client = new HttpRequestClient(token);
+                Map<String, Object> param = new HashMap<>(4);
+                param.put("Calc_Date", DateUtil.yesterday().toString(BusinessConstant.DATE_FORMAT_DAY));
+                String url = XStartup.getCurrent().getProperty("third-party.chang-qing.url");
+                url += ThirdPartyApiConstant.CQ_WELL_TECH_DAILY;
+                String resultStr = client.doPostForm(url, param);
+                context.getLogger().info("*** CQ_WELL_TECH_DAILY : {}", resultStr);
+                JSONObject jsonObject = JSON.parseObject(resultStr);
+                String data = jsonObject.getString("data");
+                list = JSON.parseArray(data, WellheadDailyProductionSituationJob.class);
+                break;
+            default:
+                return XServiceResult.OK;
+        }
         if (CollUtil.isEmpty(list)) {
             context.getLogger().info("------ WellTechDailyJob 未发现数据: {}", DateUtil.yesterday().toString("yyyy-MM-dd"));
             return XServiceResult.OK;
@@ -196,11 +215,21 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
             dtoList.add(WellheadDailyProductionSituationView.builder()
                     .wellNumber(wellhead.getWellNumber())
                     .dataDate(wellhead.getDataDate())
-                    .dailyLiquidProduction(wellhead.getDailyLiquidProduction())
-                    .productionTime(wellhead.getProductionTime())
-                    .dailyElectricityConsumption(wellhead.getDailyElectricityConsumption())
+                    .dailyLiquidProduction(ObjectUtil.defaultIfNull(wellhead.getDailyLiquidProduction(), BigDecimal.ZERO))
+                    .productionTime(ObjectUtil.defaultIfNull(wellhead.getProductionTime(), BigDecimal.ZERO))
+                    .dailyElectricityConsumption(ObjectUtil.defaultIfNull(wellhead.getDailyElectricityConsumption(), BigDecimal.ZERO))
                     .wellheadId(map.get(wellhead.getWellNumber()))
                     .systemSource(oilFieldCode)
+                    .dailyUtilityElectricityConsumption(ObjectUtil.defaultIfNull(wellhead.getDailyUtilityElectricityConsumption(), BigDecimal.ZERO))
+                    .electricityConsumptionPh(ObjectUtil.defaultIfNull(wellhead.getElectricityConsumptionPh(), BigDecimal.ZERO))
+                    .electricityConsumptionHh(ObjectUtil.defaultIfNull(wellhead.getElectricityConsumptionHh(), BigDecimal.ZERO))
+                    .electricityConsumptionNp(ObjectUtil.defaultIfNull(wellhead.getElectricityConsumptionNp(), BigDecimal.ZERO))
+                    .electricityConsumptionVh(ObjectUtil.defaultIfNull(wellhead.getElectricityConsumptionVh(), BigDecimal.ZERO))
+                    .electricityChargeCity(ObjectUtil.defaultIfNull(wellhead.getElectricityChargeCity(), BigDecimal.ZERO))
+                    .electricityChargesPh(ObjectUtil.defaultIfNull(wellhead.getElectricityChargesPh(), BigDecimal.ZERO))
+                    .peakHourTariff(ObjectUtil.defaultIfNull(wellhead.getPeakHourTariff(), BigDecimal.ZERO))
+                    .normalPeriodTariff(ObjectUtil.defaultIfNull(wellhead.getNormalPeriodTariff(), BigDecimal.ZERO))
+                    .alleyHoursTariff(ObjectUtil.defaultIfNull(wellhead.getAlleyHoursTariff(), BigDecimal.ZERO))
                     .build()
             );
         }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/wellhead_daily_production_situation/WellheadDailyProductionSituationJob.java

@@ -35,4 +35,34 @@ public class WellheadDailyProductionSituationJob {
     @XText("日产液量(t)")
     @JSONField(name = "reaL_LIQUID_DAILY")
     private BigDecimal dailyLiquidProduction;
+
+    @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;
 }

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/WellheadDailyProductionSituationViewMapper.xml

@@ -10,6 +10,17 @@
         <result column="daily_electricity_consumption" property="dailyElectricityConsumption" jdbcType="DECIMAL"/>
         <result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
+        <result column="daily_utility_electricity_consumption" property="dailyUtilityElectricityConsumption"
+                jdbcType="DECIMAL"/>
+        <result column="electricity_consumption_ph" property="electricityConsumptionPh" jdbcType="DECIMAL"/>
+        <result column="electricity_consumption_hh" property="electricityConsumptionHh" jdbcType="DECIMAL"/>
+        <result column="electricity_consumption_np" property="electricityConsumptionNp" jdbcType="DECIMAL"/>
+        <result column="electricity_consumption_vh" property="electricityConsumptionVh" jdbcType="DECIMAL"/>
+        <result column="electricity_charge_city" property="electricityChargeCity" jdbcType="DECIMAL"/>
+        <result column="electricity_charges_ph" property="electricityChargesPh" jdbcType="DECIMAL"/>
+        <result column="peak_hour_tariff" property="peakHourTariff" jdbcType="DECIMAL"/>
+        <result column="normal_period_tariff" property="normalPeriodTariff" jdbcType="DECIMAL"/>
+        <result column="alley_hours_tariff" property="alleyHoursTariff" jdbcType="DECIMAL"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -20,7 +31,17 @@
     production_time,
     daily_electricity_consumption,
     daily_liquid_production,
-    system_source
+    system_source,
+    daily_utility_electricity_consumption,
+    electricity_consumption_ph,
+    electricity_consumption_hh,
+    electricity_consumption_np,
+    electricity_consumption_vh,
+    electricity_charge_city,
+    electricity_charges_ph,
+    peak_hour_tariff,
+    normal_period_tariff,
+    alley_hours_tariff
     </sql>
     <select id="selectOne" parameterType="pps.core.prediction.entity.WellheadDailyProductionSituationView"
             resultMap="BaseResultMap">
@@ -41,7 +62,17 @@
 
     <insert id="batchInsertList" parameterType="list">
         INSERT INTO wellhead_daily_production_situation ( wellhead_id, well_number, data_date, production_time,
-        daily_electricity_consumption, daily_liquid_production, system_source )
+        daily_electricity_consumption, daily_liquid_production, system_source, daily_utility_electricity_consumption,
+        electricity_consumption_ph,
+        electricity_consumption_hh,
+        electricity_consumption_np,
+        electricity_consumption_vh,
+        electricity_charge_city,
+        electricity_charges_ph,
+        peak_hour_tariff,
+        normal_period_tariff,
+        alley_hours_tariff
+        )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -51,7 +82,17 @@
             #{item.productionTime},
             #{item.dailyElectricityConsumption},
             #{item.dailyLiquidProduction},
-            #{item.systemSource}
+            #{item.systemSource},
+            #{item.dailyUtilityElectricityConsumption},
+            #{item.electricityConsumptionPh},
+            #{item.electricityConsumptionHh},
+            #{item.electricityConsumptionNp},
+            #{item.electricityConsumptionVh},
+            #{item.electricityChargeCity},
+            #{item.electricityChargesPh},
+            #{item.peakHourTariff},
+            #{item.normalPeriodTariff},
+            #{item.alleyHoursTariff}
             )
         </foreach>
     </insert>

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/IWellDailyProductionSituationCloudService.java

+package pps.cloud.middle.service;
+
+import pps.cloud.middle.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationInput;
+import pps.cloud.middle.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationOutput;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XListResult;
+
+/**
+ * 井口日累计生产数据
+ *
+ * @author ZWT
+ * @date 2024/10/19 21:01
+ */
+@XText("井口日累计生产数据Cloud模块")
+@XService
+public interface IWellDailyProductionSituationCloudService {
+
+    /**
+     * 井口日累计生产数据列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult }<{@link GetWellheadDailyProductionSituationOutput }>
+     */
+    @XText("井口日累计生产数据列表")
+    XListResult<GetWellheadDailyProductionSituationOutput> getWellDailyProductionSituationList(XContext context, GetWellheadDailyProductionSituationInput input);
+}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class CreateWellheadDailyProductionSituationInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-public class CreateWellheadDailyProductionSituationOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class DeleteWellheadDailyProductionSituationInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class DeleteWellheadDailyProductionSituationOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class DynamicQueryWellheadDailyProductionSituationInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class DynamicQueryWellheadDailyProductionSituationOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class DynamicQueryWellheadDailyProductionSituationViewOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

 package pps.cloud.middle.service.data.wellhead_daily_production_situation;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * 井口日累计生产数据
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
+@Data
 public class GetWellheadDailyProductionSituationInput {
     @XText("ID")
     private Long id;
@@ -59,149 +67,4 @@ public class GetWellheadDailyProductionSituationInput {
 
     @XText("创建时间")
     private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
 }

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

 package pps.cloud.middle.service.data.wellhead_daily_production_situation;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * 井口日累计生产数据
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
+@Data
 public class GetWellheadDailyProductionSituationOutput {
-    @XText("ID")
-    private Long id;
 
     @XText("井号")
     private String wellNumber;
@@ -54,154 +60,9 @@ public class GetWellheadDailyProductionSituationOutput {
     @XText("日产液量(m3)")
     private BigDecimal dailyLiquidProduction;
 
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
+    @XText("生产时间(h)")
+    private BigDecimal productionTime;
 
+    @XText("日耗电量(kW-h)")
+    private BigDecimal dailyElectricityConsumption;
 }

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GetWellheadDailyProductionSituationViewInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

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

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GetWellheadDailyProductionSituationViewOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationInput.java

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class QueryWellheadDailyProductionSituationInput extends XPageInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationOutput.java

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class QueryWellheadDailyProductionSituationOutput extends XPageInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationViewInput.java

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class QueryWellheadDailyProductionSituationViewInput extends XPageInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationViewOutput.java

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class QueryWellheadDailyProductionSituationViewOutput extends XPageInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/UpdateWellheadDailyProductionSituationInput.java

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class UpdateWellheadDailyProductionSituationInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        this.systemSource = value;
-    }
-
-    public Date getCreateDate() {
-        return this.createDate;
-    }
-
-    public void setCreateDate(Date value) {
-        this.createDate = value;
-    }
-
-}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/UpdateWellheadDailyProductionSituationOutput.java

-package pps.cloud.middle.service.data.wellhead_daily_production_situation;
-
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class UpdateWellheadDailyProductionSituationOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("井号")
-    private String wellNumber;
-
-    @XText("数据日期")
-    private Date dataDate;
-
-    @XText("日耗电量(kW-h)")
-    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;
-
-    @XText("来源系统")
-    private String systemSource;
-
-    @XText("创建时间")
-    private Date createDate;
-
-    public Long getID() {
-        return this.id;
-    }
-
-    public void setID(Long value) {
-        this.id = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public Date getDataDate() {
-        return this.dataDate;
-    }
-
-    public void setDataDate(Date value) {
-        this.dataDate = value;
-    }
-
-    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 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() {
-        return this.dailyLiquidProduction;
-    }
-
-    public void setDailyLiquidProduction(BigDecimal value) {
-        this.dailyLiquidProduction = value;
-    }
-
-    public String getSystemSource() {
-        return this.systemSource;
-    }
-
-    public void setSystemSource(String value) {
-        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/entity/WellheadDailyProductionSituationView.java

 package pps.core.middle.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
@@ -15,6 +18,9 @@ import java.util.Date;
  * @date 2024/10/18
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class WellheadDailyProductionSituationView implements Serializable {
     @XText("ID")
     @TableField
@@ -87,4 +93,14 @@ public class WellheadDailyProductionSituationView implements Serializable {
     @XText("创建时间")
     @TableField
     private Date createDate;
+
+    /*----------------------------------------------------*/
+
+    @XText("生产时间(h)")
+    @TableField(exist = false)
+    private BigDecimal productionTime;
+
+    @XText("日耗电量(kW-h)")
+    @TableField(exist = false)
+    private BigDecimal dailyElectricityConsumption;
 }

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

@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 import pps.core.middle.entity.WellheadDailyProductionSituationEnt;
 
+/**
+ * 井口日累计生产数据
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
 @Repository(value = "pps.core.middle.mapper.WellheadDailyProductionSituationMapper")
 public interface WellheadDailyProductionSituationMapper extends BaseMapper<WellheadDailyProductionSituationEnt> {
 }

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

@@ -5,9 +5,23 @@ import pps.core.middle.entity.WellheadDailyProductionSituationView;
 
 import java.util.List;
 
+/**
+ * 井口日累计生产数据
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
 @Repository(value = "pps.core.middle.mapper.WellheadDailyProductionSituationViewMapper")
 public interface WellheadDailyProductionSituationViewMapper {
     WellheadDailyProductionSituationView selectOne(WellheadDailyProductionSituationView record);
 
     List<WellheadDailyProductionSituationView> selectList(WellheadDailyProductionSituationView record);
+
+    /**
+     * 日累计生产数据
+     *
+     * @param record 记录
+     * @return {@link List }<{@link WellheadDailyProductionSituationView }>
+     */
+    List<WellheadDailyProductionSituationView> selectWellDailyProductionSituationList(WellheadDailyProductionSituationView record);
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/WellDailyProductionSituationCloudServiceImpl.java

+package pps.core.middle.service;
+
+import cn.hutool.core.date.DateUtil;
+import pps.cloud.middle.service.IWellDailyProductionSituationCloudService;
+import pps.cloud.middle.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationInput;
+import pps.cloud.middle.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationOutput;
+import pps.core.middle.entity.WellheadDailyProductionSituationView;
+import pps.core.middle.mapper.WellheadDailyProductionSituationViewMapper;
+import xstartup.annotation.XService;
+import xstartup.base.XContext;
+import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
+
+import java.util.List;
+
+/**
+ * 井口日累计生产数据
+ *
+ * @author ZWT
+ * @date 2024/10/19 21:01
+ */
+@XService
+public class WellDailyProductionSituationCloudServiceImpl implements IWellDailyProductionSituationCloudService {
+
+    @Override
+    public XListResult<GetWellheadDailyProductionSituationOutput> getWellDailyProductionSituationList(XContext context, GetWellheadDailyProductionSituationInput input) {
+        WellheadDailyProductionSituationViewMapper viewMapper = context.getBean(WellheadDailyProductionSituationViewMapper.class);
+        List<WellheadDailyProductionSituationView> list = viewMapper.selectWellDailyProductionSituationList(WellheadDailyProductionSituationView.builder()
+                .dataDate(DateUtil.beginOfDay(DateUtil.yesterday()))
+                .build());
+        return XListResult.success(XCopyUtils.copyNewList(list, GetWellheadDailyProductionSituationOutput.class));
+    }
+}

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/WellheadDailyProductionSituationViewMapper.xml

@@ -58,4 +58,32 @@
         where
         id=#{id}
     </select>
+
+    <resultMap id="ExtResultMap" type="pps.core.middle.entity.WellheadDailyProductionSituationView"
+               extends="BaseResultMap">
+        <result column="PRODUCTION_TIME" property="productionTime"/>
+        <result column="DAILY_ELECTRICITY_CONSUMPTION" property="dailyElectricityConsumption"/>
+    </resultMap>
+
+    <select id="selectWellDailyProductionSituationList"
+            parameterType="pps.core.middle.entity.WellheadDailyProductionSituationView"
+            resultMap="ExtResultMap">
+        SELECT WELL_NUMBER,
+               DATA_DATE,
+               POWER_CONSUME_DAILY AS DAILY_ELECTRICITY_CONSUMPTION,
+               DAILY_UTILITY_ELECTRICITY_CONSUMPTION,
+               ELECTRICITY_CONSUMPTION_PH,
+               ELECTRICITY_CONSUMPTION_HH,
+               ELECTRICITY_CONSUMPTION_NP,
+               ELECTRICITY_CONSUMPTION_VH,
+               ELECTRICITY_CHARGE_CITY,
+               ELECTRICITY_CHARGES_PH,
+               PEAK_HOUR_TARIFF,
+               NORMAL_PERIOD_TARIFF,
+               ALLEY_HOURS_TARIFF,
+               STARTHOURS          AS PRODUCTION_TIME,
+               DAILY_LIQUID_PRODUCTION
+        FROM WELLHEAD_DAILY_PRODUCTION_SITUATION
+        WHERE TRUNC(DATA_DATE) = #{dataDate}
+    </select>
 </mapper>
\ No newline at end of file