feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -123,16 +123,8 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
         BigDecimal wellTotalPowerOptimize;
         for (Map.Entry<String, Map<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>>> lineEntry : durationCollect.entrySet()) {
             lineName = lineEntry.getKey();
-            if (activeMap.containsKey(lineName)) {
-                activePowerMap = activeMap.get(lineName);
-            } else {
-                activePowerMap = Collections.emptyMap();
-            }
-            if (predictionMap.containsKey(lineName)) {
-                predictionPowerMap = predictionMap.get(lineName);
-            } else {
-                predictionPowerMap = Collections.emptyMap();
-            }
+            activePowerMap = activeMap.getOrDefault(lineName, Collections.emptyMap());
+            predictionPowerMap = predictionMap.getOrDefault(lineName, Collections.emptyMap());
             //按顺序排
             wellSortMap = new TreeMap<>(lineEntry.getValue());
             sumServiceRating = BigDecimal.ZERO;