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

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
5.修改第三方当日油井状态定时任务,修改代码逻辑,增加区分来源系统逻辑;
6.修改第三方井场日累计数据定时任务,修改代码逻辑,增加区分来源系统逻辑;
7.修改第三方光伏日发电量定时任务,修改代码逻辑,增加区分来源系统逻辑;
8.修改第三井平均有功功率作业定时任务,修改代码逻辑,增加区分来源系统逻辑;
9.修改日耗电日产液信息定时任务,修改代码逻辑,增加区分来源系统逻辑;
10.修改查15分钟电站实际功率接口,修改代码逻辑,增加区分来源系统逻辑;
]

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -43,6 +43,11 @@ public class BusinessConstant {
      */
     public static final String DEFAULT_VALUE = "--";
 
+    /**
+     * 开井
+     */
+    public static final String OPEN_WELL = "开井";
+
     /**
      * 井口
      */

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

@@ -447,7 +447,7 @@ public class EnergyConsumptionAnalysisService {
                 .in(ThirdCurrentWellConditionEnt::getWellNumber, wellSet)
         );
         openWellNumber = (int) list.stream()
-                .filter(l -> CharSequenceUtil.equals(l.getWellStatus(), "开井"))
+                .filter(l -> CharSequenceUtil.equals(l.getWellStatus(), BusinessConstant.OPEN_WELL))
                 .count();
         return XSingleResult.success(GetPowerGenerationDetailOutput.builder()
                 .photovoltaicPower(photovoltaicPower)
@@ -514,7 +514,7 @@ public class EnergyConsumptionAnalysisService {
                 BigDecimal surplusTime;
                 currentList = new ArrayList<>(list.size());
                 for (ThirdCurrentWellConditionEnt ent : list) {
-                    if (CharSequenceUtil.equals(ent.getWellStatus(), "开井")) {
+                    if (CharSequenceUtil.equals(ent.getWellStatus(), BusinessConstant.OPEN_WELL)) {
                         openWellNumber++;
                     } else {
                         stopWellNumber++;

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

@@ -232,7 +232,7 @@ public class HomePageService {
         if (CollUtil.isNotEmpty(wellList)) {
             for (ThirdCurrentWellConditionEnt well : wellList) {
                 if (collect.containsKey(well.getWellNumber())) {
-                    if (CharSequenceUtil.equals(well.getWellStatus(), "开井")) {
+                    if (CharSequenceUtil.equals(well.getWellStatus(), BusinessConstant.OPEN_WELL)) {
                         openWellNumber++;
                         if (CharSequenceUtil.equals(collect.get(well.getWellNumber()), BusinessConstant.INTERVAL_PUMPING_WELL)) {
                             openJCNumber++;

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

@@ -65,7 +65,7 @@ public class ThirdCurrentWellConditionService {
             outputList.add(
                     QueryThirdCurrentWellConditionOutput.builder()
                             .wellNumber(ent.getWellNumber())
-                            .nextTime(CharSequenceUtil.equals(ent.getWellStatus(), "开井") ? ent.getNextTime() : null)
+                            .nextTime(CharSequenceUtil.equals(ent.getWellStatus(), BusinessConstant.OPEN_WELL) ? ent.getNextTime() : null)
                             .wellStatus(ent.getWellStatus())
                             .cumulativeProduction(ent.getCumulativeProduction())
                             .runningTime(ent.getRunningTime())