feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionAnalysisService.java

@@ -1550,6 +1550,7 @@ public class EnergyConsumptionAnalysisService {
             DateTime now = DateUtil.date();
             String currentWellStatus;
             for (Map.Entry<String, DynamicQueryBasePowerLineWellheadViewOutput> entry : collect.entrySet()) {
+                currentList = new ArrayList<>(list.size());
                 if (wellStatusMap.containsKey(entry.getKey())) {
                     ent = wellStatusMap.get(entry.getKey());
                     currentWellStatus = ent.getWellStatus();
@@ -1563,8 +1564,10 @@ public class EnergyConsumptionAnalysisService {
                 } else {
                     nextOpen = BigDecimal.ZERO;
                     currentWellStatus = "停井";
+                    if (!CharSequenceUtil.equals(currentWellStatus, input.getWellStatus())) {
+                        continue;
+                    }
                 }
-                currentList = new ArrayList<>(list.size());
                 currentList.add(
                         GetRealTimeInfoOutput.builder()
                                 .wellNumber(entry.getKey())