feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -54,10 +54,6 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
     @TableField
     private BigDecimal dailyLiquidProduction;
 
-    @XText("来源系统")
-    @TableField
-    private String systemSource;
-
     @XText("日市电用电量")
     @TableField
     private BigDecimal dailyUtilityElectricityConsumption;
@@ -97,4 +93,12 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
     @XText("谷时段用电费")
     @TableField
     private BigDecimal alleyHoursTariff;
+
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
+
+    @XText("创建时间")
+    @TableField
+    private Date createDate;
 }

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

@@ -50,10 +50,6 @@ public class WellheadDailyProductionSituationView implements Serializable {
     @TableField
     private BigDecimal dailyLiquidProduction;
 
-    @XText("来源系统")
-    @TableField
-    private String systemSource;
-
     @XText("日市电用电量")
     @TableField
     private BigDecimal dailyUtilityElectricityConsumption;
@@ -94,6 +90,14 @@ public class WellheadDailyProductionSituationView implements Serializable {
     @TableField
     private BigDecimal alleyHoursTariff;
 
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
+
+    @XText("创建时间")
+    @TableField
+    private Date createDate;
+
     /*------------------------ exist ------------------------*/
 
     @XText("线路ID")

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

 package pps.core.prediction.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
@@ -199,6 +200,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
             default:
                 return XServiceResult.OK;
         }
+        DateTime now = DateUtil.date();
         if (CollUtil.isEmpty(list)) {
             context.getLogger().info("------ WellTechDailyJob 未发现数据: {}", DateUtil.yesterday().toString("yyyy-MM-dd"));
             return XServiceResult.OK;
@@ -219,7 +221,6 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                     .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))
@@ -230,6 +231,8 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                     .peakHourTariff(ObjectUtil.defaultIfNull(wellhead.getPeakHourTariff(), BigDecimal.ZERO))
                     .normalPeriodTariff(ObjectUtil.defaultIfNull(wellhead.getNormalPeriodTariff(), BigDecimal.ZERO))
                     .alleyHoursTariff(ObjectUtil.defaultIfNull(wellhead.getAlleyHoursTariff(), BigDecimal.ZERO))
+                    .systemSource(oilFieldCode)
+                    .createDate(now)
                     .build()
             );
         }

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

@@ -21,17 +21,17 @@
         <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"/>
+        <result column="create_date" property="createDate" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id
-        ,
+    id
+    ,
     wellhead_id,
     well_number,
     data_date,
     production_time,
     daily_electricity_consumption,
     daily_liquid_production,
-    system_source,
     daily_utility_electricity_consumption,
     electricity_consumption_ph,
     electricity_consumption_hh,
@@ -41,7 +41,9 @@
     electricity_charges_ph,
     peak_hour_tariff,
     normal_period_tariff,
-    alley_hours_tariff
+    alley_hours_tariff,
+    system_source,
+    create_date
     </sql>
     <select id="selectOne" parameterType="pps.core.prediction.entity.WellheadDailyProductionSituationView"
             resultMap="BaseResultMap">
@@ -71,7 +73,8 @@
         electricity_charges_ph,
         peak_hour_tariff,
         normal_period_tariff,
-        alley_hours_tariff
+        alley_hours_tariff,
+        create_date
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -92,7 +95,8 @@
             #{item.electricityChargesPh},
             #{item.peakHourTariff},
             #{item.normalPeriodTariff},
-            #{item.alleyHoursTariff}
+            #{item.alleyHoursTariff},
+            #{item.createDate}
             )
         </foreach>
     </insert>