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

@@ -2602,8 +2602,19 @@ public class SpaceOptimizeBaseService {
             }
             //将优化结果加入结果集中,并重新排序
             if (CollUtil.isNotEmpty(replenishList)) {
-                for (SpaceOptimizeDurationDTO spaceOptimizeDurationDTO : replenishList) {
-                    optimizeDurationDTOList.add(spaceOptimizeDurationDTO);
+                for (SpaceOptimizeDurationDTO dto : optimizeDurationDTOList) {
+                    Date openTime = dto.getOpenTime();
+                    Date closeTime = dto.getCloseTime();
+                    for (SpaceOptimizeDurationDTO rep : replenishList) {
+                        Date repOpenTime = rep.getOpenTime();
+                        Date repCloseTime = rep.getCloseTime();
+                        if (DateUtil.isIn(repOpenTime, openTime, closeTime) && DateUtil.compare(repCloseTime, closeTime) >= 0) {
+                            dto.setCloseTime(repCloseTime);
+                        }
+                        if (DateUtil.isIn(repCloseTime, openTime, closeTime) && DateUtil.compare(repOpenTime, openTime) <= 0) {
+                            dto.setOpenTime(repOpenTime);
+                        }
+                    }
                 }
             }
         }
@@ -2633,6 +2644,9 @@ public class SpaceOptimizeBaseService {
         if (canMinute > wantMinute) {
             canMinute = wantMinute;
         }
+        if (wantMinute <= 0) {
+            canMinute = 0;
+        }
         return canMinute;
     }