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

@@ -101,35 +101,24 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
         }
         //初始化时间轴
         List<DateTime> rangeToList = DateUtil.rangeToList(DateUtil.offsetDay(BusinessConstant.DATE_FLAG, -1), BusinessConstant.DATE_FLAG, DateField.MINUTE, 30);
-        String lineName;
         Map<Date, BigDecimal> activePowerMap;
         Map<Date, BigDecimal> predictionPowerMap;
-        BigDecimal wellGreenPowerActual;
-        BigDecimal wellGreenPowerOptimize;
-        BigDecimal runHourActual;
-        BigDecimal runHourOptimize;
         List<SpaceOptimizeShortDurationView> unOptimizeList;
         List<SpaceOptimizeShortDurationView> optimizeList;
-        BigDecimal activePower;
-        BigDecimal predictionPower;
         TreeMap<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>> wellSortMap;
         SpaceOptimizeShortDurationView durationTemp;
-        BigDecimal serviceRating;
-        BigDecimal sumServiceRating;
         List<SpaceYesterdayGreenRateView> batchList = new ArrayList<>(durationCollect.size() * 2);
         SpaceOptimizeShortDurationView unOptimizeDuration;
         SpaceOptimizeShortDurationView optimizeDuration;
         DateTime openWellTime;
         DateTime closeWellTime;
-        BigDecimal wellTotalPowerActual;
-        BigDecimal wellTotalPowerOptimize;
         for (Map.Entry<String, Map<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>>> lineEntry : durationCollect.entrySet()) {
-            lineName = lineEntry.getKey();
+            String lineName = lineEntry.getKey();
             activePowerMap = activeMap.getOrDefault(lineName, Collections.emptyMap());
             predictionPowerMap = predictionMap.getOrDefault(lineName, Collections.emptyMap());
             //按顺序排
             wellSortMap = new TreeMap<>(lineEntry.getValue());
-            sumServiceRating = BigDecimal.ZERO;
+            BigDecimal sumServiceRating = BigDecimal.ZERO;
             //计算结果
             for (Map.Entry<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>> sortEntry : wellSortMap.entrySet()) {
                 //未优化间开
@@ -137,13 +126,13 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                 if (CollUtil.isEmpty(unOptimizeList)) {
                     continue;
                 }
-                wellGreenPowerActual = BigDecimal.ZERO;
-                wellGreenPowerOptimize = BigDecimal.ZERO;
-                runHourActual = BigDecimal.ZERO;
-                runHourOptimize = BigDecimal.ZERO;
+                BigDecimal wellGreenPowerActual = BigDecimal.ZERO;
+                BigDecimal wellGreenPowerOptimize = BigDecimal.ZERO;
+                BigDecimal runHourActual = BigDecimal.ZERO;
+                BigDecimal runHourOptimize = BigDecimal.ZERO;
                 durationTemp = unOptimizeList.get(0);
                 //累加运行功率
-                serviceRating = ObjectUtil.defaultIfNull(durationTemp.getServiceRating(), BigDecimal.ZERO);
+                BigDecimal serviceRating = ObjectUtil.defaultIfNull(durationTemp.getServiceRating(), BigDecimal.ZERO);
                 sumServiceRating = sumServiceRating.add(serviceRating);
                 //优化后间开
                 optimizeList = sortEntry.getValue().get(0);
@@ -153,7 +142,7 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                 //计算优化前后功率
                 for (DateTime dateTime : rangeToList) {
                     //计算实际
-                    activePower = activePowerMap.getOrDefault(dateTime, BigDecimal.ZERO);
+                    BigDecimal activePower = activePowerMap.getOrDefault(dateTime, BigDecimal.ZERO);
                     unOptimizeDuration = unOptimizeList.get(unOptimizeIndex);
                     //时间转换
                     openWellTime = this.parseDateTime(unOptimizeDuration.getOpenWellTime());
@@ -179,7 +168,7 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                     }
                     /*--------------------------------------------------*/
                     if (optimizeListFlag) {
-                        predictionPower = predictionPowerMap.getOrDefault(dateTime, BigDecimal.ZERO);
+                        BigDecimal predictionPower = predictionPowerMap.getOrDefault(dateTime, BigDecimal.ZERO);
                         optimizeDuration = optimizeList.get(optimizeIndex);
                         //时间转换
                         openWellTime = this.parseDateTime(optimizeDuration.getOpenWellTime());
@@ -206,8 +195,8 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                     }
                 }
                 //添加计算结果
-                wellTotalPowerActual = runHourActual.multiply(serviceRating);
-                wellTotalPowerOptimize = runHourOptimize.multiply(serviceRating);
+                BigDecimal wellTotalPowerActual = runHourActual.multiply(serviceRating);
+                BigDecimal wellTotalPowerOptimize = runHourOptimize.multiply(serviceRating);
                 SpaceYesterdayGreenRateView yesterdayGreenRateView = new SpaceYesterdayGreenRateView();
                 BaseUtils.setBaseModelDefaultForJob(yesterdayGreenRateView);
                 yesterdayGreenRateView.setRecordDate(beginOfYesterday);