feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java

@@ -189,7 +189,7 @@ public class BasePhotovoltaicPlantService {
             cloudInput.setPlantId(input.getId());
             XSingleResult<GetPlantTrainPowerTaskCloudOutput> result = cloudService.getPlantTrainPowerTaskData(context, cloudInput);
             if (result.isSuccess() && ObjectUtil.isNotNull(result.getResult())) {
-                BigDecimal relMape = ObjectUtil.defaultIfNull(new BigDecimal(result.getResult().getMetricsScore()), BigDecimal.ZERO);
+                BigDecimal relMape = ObjectUtil.defaultIfNull(new BigDecimal(result.getResult().getMetricsScore()), BigDecimal.ZERO).multiply(BusinessConstant.BIG_DECIMAL_100);
                 BigDecimal mape;
                 //获取调整的准确率附加值
                 BasePhotovoltaicPlantMapeAdjViewMapper mapeAdjMapper = context.getBean(BasePhotovoltaicPlantMapeAdjViewMapper.class);

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

 package pps.core.prediction.service;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.prediction.service.PlantTrainPowerTaskCloudService;
 import pps.cloud.prediction.service.data.plant_train_power_task.GetPlantTrainPowerTaskCloudInput;
@@ -20,22 +19,8 @@ public class PlantTrainPowerTaskService implements PlantTrainPowerTaskCloudServi
         PlantTrainPowerTaskMapper mapper = context.getBean(PlantTrainPowerTaskMapper.class);
         LambdaQueryWrapper<PlantTrainPowerTaskEnt> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PlantTrainPowerTaskEnt::getPlantId, input.getPlantId())
-                .eq(PlantTrainPowerTaskEnt::getModelCycle, input.getModelCycle())
-                .eq(PlantTrainPowerTaskEnt::getRunState, 1)
-                .eq(PlantTrainPowerTaskEnt::getRunStep, "model_train")
-                .orderByDesc(PlantTrainPowerTaskEnt::getCreateTime)
                 .last(BusinessConstant.LAST_LIMIT);
         PlantTrainPowerTaskEnt ent = mapper.selectOne(queryWrapper);
-        if (ObjectUtil.isNull(ent)) {
-            queryWrapper.clear();
-            queryWrapper.eq(PlantTrainPowerTaskEnt::getModelKey, "all_plant_data")
-                    .eq(PlantTrainPowerTaskEnt::getModelCycle, input.getModelCycle())
-                    .eq(PlantTrainPowerTaskEnt::getRunState, 1)
-                    .eq(PlantTrainPowerTaskEnt::getRunStep, "model_train")
-                    .orderByDesc(PlantTrainPowerTaskEnt::getCreateTime)
-                    .last(BusinessConstant.LAST_LIMIT);
-            ent = mapper.selectOne(queryWrapper);
-        }
         GetPlantTrainPowerTaskCloudOutput output = XCopyUtils.copyNewObject(ent, GetPlantTrainPowerTaskCloudOutput.class);
         return XSingleResult.success(output);
     }