feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -53,12 +53,12 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
         List<ThirdPhotovoltaicPowerEnt> powerList = powerMapper.selectList(new LambdaQueryWrapper<ThirdPhotovoltaicPowerEnt>()
                 .eq(ThirdPhotovoltaicPowerEnt::getSystemSource, oilFieldCode)
         );
-        Map<String, BigDecimal> powerMap;
+        Map<Date, Map<String, BigDecimal>> powerMap;
         if (CollUtil.isEmpty(powerList)) {
             powerMap = Collections.emptyMap();
         } else {
             powerMap = powerList.stream()
-                    .collect(Collectors.toMap(ThirdPhotovoltaicPowerEnt::getStationName, ThirdPhotovoltaicPowerEnt::getPhotovoltaicPower));
+                    .collect(Collectors.groupingBy(ThirdPhotovoltaicPowerEnt::getCreateDate, Collectors.toMap(ThirdPhotovoltaicPowerEnt::getStationName, ThirdPhotovoltaicPowerEnt::getPhotovoltaicPower)));
         }
         Map<Date, Map<String, WellheadDailyProductionSituationEnt>> collect = wellDailyList.stream()
                 .collect(Collectors.groupingBy(WellheadDailyProductionSituationEnt::getDataDate, Collectors.toMap(WellheadDailyProductionSituationEnt::getWellNumber, Function.identity())));
@@ -73,6 +73,10 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
         WellheadDailyProductionSituationEnt wellDaily;
         for (Map.Entry<Date, Map<String, WellheadDailyProductionSituationEnt>> dateMapEntry : collect.entrySet()) {
             Date key = dateMapEntry.getKey();
+            Map<String, BigDecimal> stringBigDecimalMap = powerMap.get(key);
+            if (CollUtil.isEmpty(stringBigDecimalMap)) {
+                stringBigDecimalMap = Collections.emptyMap();
+            }
             Map<String, WellheadDailyProductionSituationEnt> wellMap = dateMapEntry.getValue();
             for (Map.Entry<String, List<DynamicQueryBasePowerLineWellheadViewOutput>> entry : lineMap.entrySet()) {
                 view = new StationDailyProductionSituationView();
@@ -80,7 +84,7 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
                 view.setSystemSource(oilFieldCode);
                 view.setDataDate(key);
                 view.setCreateDate(now);
-                view.setPhotovoltaicPower(powerMap.getOrDefault(entry.getKey(), BigDecimal.ZERO));
+                view.setPhotovoltaicPower(stringBigDecimalMap.getOrDefault(entry.getKey(), BigDecimal.ZERO));
                 view.setProductionTime(BigDecimal.ZERO);
                 view.setDailyLiquidProduction(BigDecimal.ZERO);
                 view.setDailyElectricityConsumption(BigDecimal.ZERO);