feat(零碳): 长庆

1.修改极短期间开预测定时任务逻辑,解决优化后部分优化结果时间段过短问题;
2.修改心知天气气象数据获取及接收定时任务,解决天气数据通过邮件下载后,部分数据精度丢失问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortPeriodService.java

@@ -269,41 +269,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                             .intValue();
                     SpaceOptimizeWeight weight;
                     //分级取时间段
-                    List<SpaceOptimizeWeightDuration> weightDurationList = new ArrayList<>(32);
-                    long between;
-                    for (int i1 = 0; i1 < ladder.length; i1++) {
-                        int begin = -1;
-                        //取每级时间
-                        for (int i2 = 0; i2 < weightList.size(); i2++) {
-                            weight = weightList.get(i2);
-                            //过滤条件:权重相同
-                            if (ladder[i1] == weight.getWeight()) {
-                                //确定开始时间位置
-                                if (begin == -1) {
-                                    begin = i2;
-                                }
-                            } else if (begin != -1) {
-                                //如果开井时间不满足最小开井时间则舍弃
-                                between = DateUtil.between(weightList.get(begin).getTimestamp(), weightList.get(i2).getTimestamp(), DateUnit.MINUTE);
-                                if (minOpenMinute <= between) {
-                                    //创建区间
-                                    weightDurationList.add(
-                                            SpaceOptimizeWeightDuration.builder()
-                                                    .openTime(weightList.get(begin).getTimestamp())
-                                                    .closeTime(weightList.get(i2).getTimestamp())
-                                                    .openIndex(begin)
-                                                    .closeIndex(i2)
-                                                    .duration(between)
-                                                    .weight(ladder[i1])
-                                                    .build()
-                                    );
-                                }
-                                begin = -1;
-                            }
-                        }
-                    }
-                    //时间处理并排序(处理后第一次开井时间的索引位置为0)
-                    weightDurationList.sort((o1, o2) -> o2.getWeight() - o1.getWeight());
+                    List<SpaceOptimizeWeightDuration> weightDurationList = this.weightListProcessing(ladder, weightList, minOpenMinute);
                     List<SpaceOptimizeDurationDTO> optimizeDurationDTOList = new ArrayList<>(12);
                     //总开井时间
                     long sumOpenTime = 0;
@@ -824,8 +790,13 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                         }
                     }
                     //计算权重时间轴
+                    //每日最小开井时长(分钟)
+                    int minOpenMinute = tundraStrategyWellhead.getMinOpen()
+                            .multiply(BusinessConstant.SIXTY)
+                            .intValue();
                     serviceRating = serviceRating.add(tundraStrategyWellhead.getServiceRating());
                     List<SpaceOptimizeWeight> weightList = this.calculateWeightList(serviceRating, rangeToList, powerList, strategyList);
+                    List<SpaceOptimizeWeightDuration> weightDurationList = this.weightListProcessing(ladder, weightList, minOpenMinute);
                     //关井时间优化
                     if (CollUtil.isNotEmpty(closeList)) {
                         //补时间
@@ -881,6 +852,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         });
     }
 
+
     /**
      * 计算权重列表
      *
@@ -976,6 +948,54 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         return weightList;
     }
 
+    /**
+     * 权重时间处理
+     *
+     * @param ladder        梯子
+     * @param weightList    重量清单
+     * @param minOpenMinute 最小开放分钟
+     * @return {@link List}<{@link SpaceOptimizeWeightDuration}>
+     */
+    private List<SpaceOptimizeWeightDuration> weightListProcessing(int[] ladder, List<SpaceOptimizeWeight> weightList, int minOpenMinute) {
+        SpaceOptimizeWeight weight;
+        //分级取时间段
+        List<SpaceOptimizeWeightDuration> weightDurationList = new ArrayList<>(32);
+        long between;
+        for (int i1 = 0; i1 < ladder.length; i1++) {
+            int begin = -1;
+            //取每级时间
+            for (int i2 = 0; i2 < weightList.size(); i2++) {
+                weight = weightList.get(i2);
+                //过滤条件:权重相同
+                if (ladder[i1] == weight.getWeight()) {
+                    //确定开始时间位置
+                    if (begin == -1) {
+                        begin = i2;
+                    }
+                } else if (begin != -1) {
+                    //如果开井时间不满足最小开井时间则舍弃
+                    between = DateUtil.between(weightList.get(begin).getTimestamp(), weightList.get(i2).getTimestamp(), DateUnit.MINUTE);
+                    if (minOpenMinute <= between) {
+                        //创建区间
+                        weightDurationList.add(
+                                SpaceOptimizeWeightDuration.builder()
+                                        .openTime(weightList.get(begin).getTimestamp())
+                                        .closeTime(weightList.get(i2).getTimestamp())
+                                        .openIndex(begin)
+                                        .closeIndex(i2)
+                                        .duration(between)
+                                        .weight(ladder[i1])
+                                        .build()
+                        );
+                    }
+                    begin = -1;
+                }
+            }
+        }
+        //时间处理并排序(处理后第一次开井时间的索引位置为0)
+        weightDurationList.sort((o1, o2) -> o2.getWeight() - o1.getWeight());
+        return weightDurationList;
+    }
 
     /**
      * 极短期间开开优化--分页列表