feat(吉林演示): 松原

1.新建气象局数据收集表,同时生成相关代码;
2.修改天气数据处理转换定时任务,增加处理保存气象局天气数据逻辑,同时解决接收数据入库重复问题;
3.修改风资源功率预测中期三天功率预测结果接口,增加风速等响应字段;
4.修改风资源功率预测中期十天功率预测结果接口,增加风速等响应字段;
5.修改风资源功率预测超短期4小时功率预测结果接口,增加风速等响应字段;
6.修复登录后没有清除验证码导致可以重复登录问题;
7.开发风预测训练集数据保存定时任务,完成定时任务冒烟测试;
8.开发风资源历史数据导入功能,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -181,12 +181,12 @@ public class WindPredictionFutureService {
     private Map<Date, WindPredictionFutureEnt> getPredictedMap(XContext context, String stationId, DateTime beginTime, DateTime endTime) {
         WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class);
         List<WindPredictionFutureEnt> predictedList = mapper.selectList(new QueryWrapper<WindPredictionFutureEnt>()
-                .select("data_time", "IFNULL( predicted_power, 0 ) AS predicted_power", "actual_wind_speed", "wind_speed")
+                .select("data_time", "IFNULL( MAX( predicted_power ), 0 ) AS predicted_power", "actual_wind_speed", "wind_speed")
                 .lambda()
                 .eq(WindPredictionFutureEnt::getStationId, stationId)
                 .between(WindPredictionFutureEnt::getDataTime, beginTime, endTime)
-                .groupBy(WindPredictionFutureEnt::getDataTime, WindPredictionFutureEnt::getPredictedPower
-                        , WindPredictionFutureEnt::getActualWindSpeed, WindPredictionFutureEnt::getWindSpeed)
+                .groupBy(WindPredictionFutureEnt::getDataTime, WindPredictionFutureEnt::getActualWindSpeed,
+                        WindPredictionFutureEnt::getWindSpeed)
                 .orderByAsc(WindPredictionFutureEnt::getDataTime)
         );
         Map<Date, WindPredictionFutureEnt> predictedMap;