feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -501,7 +501,7 @@ public class HomePageService {
      * @return {@link XSingleResult}<{@link GetPowerPredictionOutput}>
      */
     @XText("首页模块--光伏实时监控")
-    @XApiGet(anonymous = true)
+    @XApiGet
     public XListResult<GetPowerPredictionOutput> getPowerPrediction(XContext context, GetStationViewInput input) {
         String plantId = input.getPlantId();
         List<GetBasePhotovoltaicPlantCloudOutput> plantList;
@@ -532,14 +532,12 @@ public class HomePageService {
                         .startTime(day.toString(BusinessConstant.DATE_FORMAT_DAY))
                         .endTime(DateUtil.offsetDay(day, 1).toString(BusinessConstant.DATE_FORMAT_DAY))
                         .plantIds(plantIds)
-//                        .plantId(plantId)
                         .build()).stream()
                 .collect(Collectors.toMap(PredictedPowerView::getHourTime, PredictedPowerView::getPower));
         //实际功率
         ThirdActivePowerDailyUpdateViewMapper nowMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
         Map<Integer, BigDecimal> powerMap = nowMapper.selectEnergyUseCurve(ThirdActivePowerDailyUpdateView.builder()
                         .stationIds(plantIds)
-//                        .stationId(plantId)
                         .saveDate(day)
                         .createDate(showTime)
                         .systemSource(ServiceUtil.getOilFieldCode(context))

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/ThirdActivePowerDailyUpdateViewMapper.xml

@@ -101,11 +101,8 @@
             <if test="stationId != null">
                 AND station_id = #{stationId}
             </if>
-            <if test="saveDate != null">
-                AND save_date = #{saveDate}
-            </if>
             <if test="createDate != null">
-                AND create_date &lt;= #{createDate}
+                AND create_date BETWEEN #{saveDate} AND #{createDate}
             </if>
             <if test="stationIds != null and stationIds.size() > 0">
                 AND station_id IN