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

@@ -117,15 +117,15 @@ public class SpaceOptimizeBaseService {
             } else {
                 strategyMap = Collections.emptyMap();
             }
-            //线路ID/峰谷策略ID Map
-            Map<String, String> lineStrategyMap;
+            //线路 Map
+            Map<String, DynamicQueryBasePowerLineOutput> lineMap;
             //取线路列表
             List<DynamicQueryBasePowerLineOutput> powerLineList = ServiceUtil.getPowerLineList(context, new DynamicQueryBasePowerLineInput());
             if (CollUtil.isNotEmpty(powerLineList)) {
-                lineStrategyMap = powerLineList.stream()
-                        .collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, DynamicQueryBasePowerLineOutput::getStrategyId));
+                lineMap = powerLineList.stream()
+                        .collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, Function.identity()));
             } else {
-                lineStrategyMap = Collections.emptyMap();
+                lineMap = Collections.emptyMap();
             }
             //线路ID/电站ID LIST Map
             Map<String, List<String>> plantIdsMap;
@@ -154,6 +154,7 @@ public class SpaceOptimizeBaseService {
             DateTime begin;
             Map<Date, List<SpaceOptimizeWellheadDTO>> wellDateMap;
             List<SpaceOptimizeWellheadDTO> optimizeWellList;
+            DynamicQueryBasePowerLineOutput line;
             List<String> plantIds;
             List<DynamicQueryPlantPredictedPowerOutput> powerList;
             String monthBaseOne;
@@ -162,18 +163,21 @@ public class SpaceOptimizeBaseService {
             BigDecimal serviceRating;
             List<SpaceOptimizeWeight> weightList;
             for (SpaceOptimizePeriodDTO period : periodDTOList) {
+                //取线路
+                if (!lineMap.containsKey(period.getLineId())) {
+                    continue;
+                }
+                line = lineMap.get(period.getLineId());
                 //取电站ID列表
                 plantIds = plantIdsMap.get(period.getLineId());
                 for (int d = 0; d <= offset; d++) {
                     begin = DateUtil.offsetDay(now, d);
                     //取市电峰谷
-                    if (lineStrategyMap.containsKey(period.getLineId())) {
-                        monthBaseOne = String.valueOf(begin.monthBaseOne());
-                        if (strategyMap.containsKey(monthBaseOne)) {
-                            monthStrategyMap = strategyMap.get(monthBaseOne);
-                            if (monthStrategyMap.containsKey(lineStrategyMap.get(period.getLineId()))) {
-                                monthStrategyList = monthStrategyMap.get(lineStrategyMap.get(period.getLineId()));
-                            }
+                    monthBaseOne = String.valueOf(begin.monthBaseOne());
+                    if (strategyMap.containsKey(monthBaseOne)) {
+                        monthStrategyMap = strategyMap.get(monthBaseOne);
+                        if (monthStrategyMap.containsKey(line.getStrategyId())) {
+                            monthStrategyList = monthStrategyMap.get(line.getStrategyId());
                         }
                     }
                     if (CollUtil.isEmpty(monthStrategyList)) {