feat[零碳项目]: 松原演示

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/WellheadDailyProductionSituationViewMapper.java

@@ -31,8 +31,9 @@ public interface WellheadDailyProductionSituationViewMapper {
     /**
      * 选择每日用电量总和
      *
-     * @param date 日期
+     * @param date         日期
+     * @param oilFieldCode 来源系统
      * @return {@link List}<{@link WellheadDailyProductionSituationView}>
      */
-    List<WellheadDailyProductionSituationView> selectSumDailyElectricityConsumption(@Param("date") Date date);
+    List<WellheadDailyProductionSituationView> selectSumDailyElectricityConsumption(@Param("date") Date date, @Param("oilFieldCode") String oilFieldCode);
 }

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

@@ -212,10 +212,12 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
     public XServiceResult energyConsumptionAnalysisJob(XContext context) {
         DateTime yesterday = DateUtil.beginOfDay(DateUtil.yesterday());
         context.getLogger().info("------ EnergyConsumptionAnalysisJob yesterday:{}", yesterday.toString());
+        String oilFieldCode = ServiceUtil.getOilFieldCode(context);
         //查昨日光伏发电量
         ThirdPhotovoltaicPowerMapper powerMapper = context.getBean(ThirdPhotovoltaicPowerMapper.class);
         List<ThirdPhotovoltaicPowerEnt> powerList = powerMapper.selectList(new LambdaQueryWrapper<ThirdPhotovoltaicPowerEnt>()
                 .eq(ThirdPhotovoltaicPowerEnt::getCreateDate, yesterday)
+                .eq(ThirdPhotovoltaicPowerEnt::getSystemSource, oilFieldCode)
         );
         if (CollUtil.isEmpty(powerList)) {
             context.getLogger().info("------ EnergyConsumptionAnalysisJob powerList isEmpty");
@@ -228,7 +230,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                 .collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getLineName, DynamicQueryBasePowerLineOutput::getId));
         //查昨日井口耗电量
         WellheadDailyProductionSituationViewMapper mapper = context.getBean(WellheadDailyProductionSituationViewMapper.class);
-        List<WellheadDailyProductionSituationView> situationList = mapper.selectSumDailyElectricityConsumption(yesterday);
+        List<WellheadDailyProductionSituationView> situationList = mapper.selectSumDailyElectricityConsumption(yesterday, oilFieldCode);
         Map<String, BigDecimal> collect = situationList.stream()
                 .collect(Collectors.toMap(WellheadDailyProductionSituationView::getLineId, WellheadDailyProductionSituationView::getDailyElectricityConsumption));
         //封装

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

@@ -64,14 +64,17 @@
 
     <select id="selectSumDailyElectricityConsumption" parameterType="date"
             resultType="pps.core.prediction.entity.WellheadDailyProductionSituationView">
-        SELECT w.line_id                                       AS line_id,
-               l.line_name                                     AS line_name,
-               IFNULL(SUM(s.daily_electricity_consumption), 0) AS daily_electricity_consumption
+        SELECT w.line_id AS line_id,
+        l.line_name AS line_name,
+        IFNULL(SUM(s.daily_electricity_consumption), 0) AS daily_electricity_consumption
         FROM base_power_line_wellhead w
-                 JOIN wellhead_daily_production_situation s ON w.wellhead_id = s.wellhead_id
-                 LEFT JOIN base_power_line l ON w.line_id = l.id
+        JOIN wellhead_daily_production_situation s ON w.wellhead_id = s.wellhead_id
+        LEFT JOIN base_power_line l ON w.line_id = l.id
         WHERE w.is_deleted = 1
-          AND s.data_date = #{date}
+        AND s.data_date = #{date}
+        <if test="systemSource != null">
+            AND s.system_source = #{systemSource}
+        </if>
         GROUP BY w.line_id
     </select>
 </mapper>
\ No newline at end of file