feat(吉林演示): 松原

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;
4.排查并修复天气数据获取服务,数据处理后入库缺少数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -2636,18 +2636,39 @@ public class SpaceOptimizeBaseService {
             }
             //将优化结果加入结果集中,并重新排序
             if (CollUtil.isNotEmpty(replenishList)) {
-                for (SpaceOptimizeDurationDTO dto : optimizeDurationDTOList) {
-                    Date openTime = dto.getOpenTime();
-                    Date closeTime = dto.getCloseTime();
+                //记录未使用的间开
+                List<SpaceOptimizeDurationDTO> tempList = new ArrayList<>(12);
+                //标识:0_未使用,1_开井用了,2_关井用了
+                int isIn;
                 for (SpaceOptimizeDurationDTO rep : replenishList) {
                     Date repOpenTime = rep.getOpenTime();
                     Date repCloseTime = rep.getCloseTime();
+                    isIn = 0;
+                    for (SpaceOptimizeDurationDTO dto : optimizeDurationDTOList) {
+                        Date openTime = dto.getOpenTime();
+                        Date closeTime = dto.getCloseTime();
                         if (DateUtil.isIn(repOpenTime, openTime, closeTime) && DateUtil.compare(repCloseTime, closeTime) >= 0) {
                             dto.setCloseTime(repCloseTime);
+                            if (isIn == 1) {
+                                continue;
+                            }
+                            isIn = 1;
                         }
                         if (DateUtil.isIn(repCloseTime, openTime, closeTime) && DateUtil.compare(repOpenTime, openTime) <= 0) {
                             dto.setOpenTime(repOpenTime);
+                            if (isIn == 2) {
+                                continue;
+                            }
+                            isIn = 2;
+                        }
+                    }
+                    if (isIn == 0) {
+                        tempList.add(rep);
+                    }
                 }
+                if (CollUtil.isNotEmpty(tempList)) {
+                    for (SpaceOptimizeDurationDTO temp : tempList) {
+                        optimizeDurationDTOList.add(temp);
                     }
                 }
             }