feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -211,6 +211,11 @@ public class BusinessConstant {
      */
     public static final BigDecimal BIG_DECIMAL_4 = BigDecimal.valueOf(4);
 
+    /**
+     * 24
+     */
+    public static final BigDecimal BIG_DECIMAL_24 = BigDecimal.valueOf(24);
+
     /**
      * 60
      */

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

@@ -164,14 +164,6 @@ public class SpaceOptimizeBaseService {
                 plantIds = plantIdsMap.get(period.getLineId());
                 for (int d = 0; d <= offset; d++) {
                     begin = DateUtil.offsetDay(now, d);
-                    //取优化井
-                    if (!wellMap.containsKey(period.getId())) {
-                        continue;
-                    }
-                    wellDateMap = wellMap.get(period.getId());
-                    if (!wellDateMap.containsKey(begin)) {
-                        continue;
-                    }
                     //取市电峰谷
                     if (lineStrategyMap.containsKey(period.getLineId())) {
                         monthBaseOne = String.valueOf(begin.monthBaseOne());
@@ -182,6 +174,17 @@ public class SpaceOptimizeBaseService {
                             }
                         }
                     }
+                    if (CollUtil.isEmpty(monthStrategyList)) {
+                        continue;
+                    }
+                    //取优化井
+                    if (!wellMap.containsKey(period.getId())) {
+                        continue;
+                    }
+                    wellDateMap = wellMap.get(period.getId());
+                    if (!wellDateMap.containsKey(begin)) {
+                        continue;
+                    }
                     //查光伏预测
                     powerList = this.getAveragePowerHalfHour(context, DynamicQueryPlantPredictedPowerInput.builder()
                             .plantIds(plantIds)
@@ -203,7 +206,6 @@ public class SpaceOptimizeBaseService {
                     }
                 }
             }
-            System.out.println();
         }
     }