feat(吉林演示): 松原

1.开发中间库表结构及数据导出功能,检查中间库表结构是否有变动,同时获取最新数据,验证数据是否更新;
2.创建场站每日信息统计记录表,新建场站日信息数据采集汇总定时任务,整理汇总场站纬度每日数据,完成功能验证;
3.针对吉林提供的统计数据,对吉林首页部分功能修改;
4.针对中间库每日井口数据统计表结构变动,修改井口日统计定时任务数据处理逻辑,完成功能验证;
5.修改日发电量统计定时任务,排查数据丢失问题,完成功能验证;
6.修改场站每日信息汇总统计定时任务,增加统计每日光伏发电量逻辑,修改表结构及数据结构和业务处理逻辑,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -88,6 +88,10 @@ public class StationDailyProductionSituationEnt implements Serializable {
     @TableField
     private BigDecimal alleyHoursTariff;
 
+    @XText("光伏发电量(KW·h)")
+    @TableField
+    private BigDecimal photovoltaicPower;
+
     @XText("来源系统")
     @TableField
     private String systemSource;

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

@@ -84,6 +84,10 @@ public class StationDailyProductionSituationView implements Serializable {
     @TableField
     private BigDecimal alleyHoursTariff;
 
+    @XText("光伏发电量(KW·h)")
+    @TableField
+    private BigDecimal photovoltaicPower;
+
     @XText("来源系统")
     @TableField
     private String systemSource;

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

@@ -8,8 +8,10 @@ import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowe
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.cloud.prediction.service.IStationDailyCloudService;
 import pps.core.prediction.entity.StationDailyProductionSituationView;
+import pps.core.prediction.entity.ThirdPhotovoltaicPowerEnt;
 import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
 import pps.core.prediction.mapper.StationDailyProductionSituationViewMapper;
+import pps.core.prediction.mapper.ThirdPhotovoltaicPowerMapper;
 import pps.core.prediction.mapper.WellheadDailyProductionSituationMapper;
 import pps.core.prediction.utils.ServiceUtil;
 import xstartup.annotation.XService;
@@ -19,6 +21,7 @@ import xstartup.helper.XTransactionHelper;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -51,6 +54,19 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
         if (CollUtil.isEmpty(lineWellheadList)) {
             return XServiceResult.OK;
         }
+        //查日累积光伏发电量
+        ThirdPhotovoltaicPowerMapper powerMapper = context.getBean(ThirdPhotovoltaicPowerMapper.class);
+        List<ThirdPhotovoltaicPowerEnt> powerList = powerMapper.selectList(new LambdaQueryWrapper<ThirdPhotovoltaicPowerEnt>()
+                .eq(ThirdPhotovoltaicPowerEnt::getCreateDate, yesterday)
+                .eq(ThirdPhotovoltaicPowerEnt::getSystemSource, oilFieldCode)
+        );
+        Map<String, BigDecimal> powerMap;
+        if (CollUtil.isEmpty(powerList)) {
+            powerMap = Collections.emptyMap();
+        } else {
+            powerMap = powerList.stream()
+                    .collect(Collectors.toMap(ThirdPhotovoltaicPowerEnt::getStationName, ThirdPhotovoltaicPowerEnt::getPhotovoltaicPower));
+        }
         //按井号分组
         Map<String, WellheadDailyProductionSituationEnt> wellMap = wellDailyList.stream()
                 .collect(Collectors.toMap(WellheadDailyProductionSituationEnt::getWellNumber, Function.identity()));
@@ -69,6 +85,7 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
             view.setDataDate(yesterday);
             view.setSystemSource(oilFieldCode);
             view.setCreateDate(now);
+            view.setPhotovoltaicPower(powerMap.getOrDefault(entry.getKey(), BigDecimal.ZERO));
             view.setProductionTime(BigDecimal.ZERO);
             view.setDailyLiquidProduction(BigDecimal.ZERO);
             view.setDailyElectricityConsumption(BigDecimal.ZERO);

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

@@ -20,6 +20,7 @@
         <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="photovoltaic_power" property="photovoltaicPower" jdbcType="DECIMAL"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
         <result column="create_date" property="createDate" jdbcType="VARCHAR"/>
     </resultMap>
@@ -42,6 +43,7 @@
     peak_hour_tariff,
     normal_period_tariff,
     alley_hours_tariff,
+    photovoltaic_power,
     system_source,
     create_date
     </sql>
@@ -78,6 +80,7 @@
         peak_hour_tariff,
         normal_period_tariff,
         alley_hours_tariff,
+        photovoltaic_power,
         system_source,
         create_date
         ) VALUES
@@ -98,6 +101,7 @@
             #{item.peakHourTariff},
             #{item.normalPeriodTariff},
             #{item.alleyHoursTariff},
+            #{item.photovoltaicPower},
             #{item.systemSource},
             #{item.createDate}
             )