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

@@ -1393,7 +1393,7 @@ public class SpaceOptimizeBaseService {
                 Date closeTime = duration.getCloseTime();
                 DateTime endTime;
                 if (ObjectUtil.isNull(closeTime)) {
-                    endTime = DateUtil.beginOfDay(DateUtil.tomorrow());
+                    endTime = BusinessConstant.DATE_FLAG;
                 } else {
                     endTime = DateUtil.date(closeTime);
                 }
@@ -1501,28 +1501,22 @@ public class SpaceOptimizeBaseService {
                     DateTime startOffset = DateUtil.offsetMinute(startTime, between);
                     DateTime endOffset = DateUtil.offsetMinute(endTime, between);
                     if (startOffset.compareTo(BusinessConstant.DATE_FLAG) < 0 && endOffset.compareTo(BusinessConstant.DATE_FLAG) > 0) {
-                        //如果时间超过当天,舍弃
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                startOffset.toString(BusinessConstant.MINUTES_FORMAT),
-                                BusinessConstant.END_OF_DAY_TIME,
+                                startOffset.toString(BusinessConstant.MINUTES_FORMAT), BusinessConstant.END_OF_DAY_TIME,
                                 BusinessConstant.ONE, optimizeDate
                         );
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                BusinessConstant.START_OF_DAY_TIME,
-                                endOffset.toString(BusinessConstant.MINUTES_FORMAT),
+                                BusinessConstant.START_OF_DAY_TIME, endOffset.toString(BusinessConstant.MINUTES_FORMAT),
                                 BusinessConstant.ONE, optimizeDate
                         );
                     } else if (endOffset.compareTo(BusinessConstant.DATE_FLAG) == 0) {
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                startOffset.toString(BusinessConstant.MINUTES_FORMAT),
-                                BusinessConstant.END_OF_DAY_TIME,
+                                startOffset.toString(BusinessConstant.MINUTES_FORMAT), BusinessConstant.END_OF_DAY_TIME,
                                 BusinessConstant.ONE, optimizeDate
                         );
                     } else {
-                        //计算偏移
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                startOffset.toString(BusinessConstant.MINUTES_FORMAT),
-                                endOffset.toString(BusinessConstant.MINUTES_FORMAT),
+                                startOffset.toString(BusinessConstant.MINUTES_FORMAT), endOffset.toString(BusinessConstant.MINUTES_FORMAT),
                                 BusinessConstant.ONE, optimizeDate
                         );
                     }