feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -234,9 +234,7 @@ public class SpaceOptimizeBaseService {
                         .endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY))
                         .dateType(dateType)
                         .build());
-                powerGenerationList = powerList.stream()
-                        .map(DynamicQueryPlantPredictedPowerOutput::getPower)
-                        .collect(Collectors.toList());
+                powerGenerationList = this.powerGenerationList(rangeToList, powerList);
                 this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList,
                         unOptimizeWellhead, durationMap.get(detail.getId()), periodId, recordTime);
                 Integer tundraStrategy = detail.getTundraStrategy();
@@ -3847,4 +3845,27 @@ public class SpaceOptimizeBaseService {
         }
         return electricityCostList;
     }
+
+    /**
+     * 发电列表
+     *
+     * @param rangeToList 要列出范围
+     * @param powerList   电源列表
+     * @return {@link List }<{@link BigDecimal }>
+     */
+    private List<BigDecimal> powerGenerationList(List<DateTime> rangeToList, List<DynamicQueryPlantPredictedPowerOutput> powerList) {
+        List<BigDecimal> electricityCostList = new ArrayList<>();
+        DateTime dateTime;
+        BigDecimal result = null;
+        for (int i = 1; i < rangeToList.size(); i++) {
+            dateTime = rangeToList.get(i);
+            for (DynamicQueryPlantPredictedPowerOutput power : powerList) {
+                if (DateUtil.compare(dateTime, power.getCreateTime()) == 0) {
+                    result = power.getPower();
+                }
+            }
+            electricityCostList.add(ObjectUtil.defaultIfNull(result, BigDecimal.ZERO));
+        }
+        return electricityCostList;
+    }
 }
\ No newline at end of file