feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -38,10 +38,10 @@ public class BaseLineService {
     }
 
     @XText("天气")
-    @XApiGet(anonymous = true)
+    @XApiGet
     public XServiceResult test(XContext context, GetBaseDataInput input) {
-        BaseWeatherCloudServiceImpl bean = context.getBean(BaseWeatherCloudServiceImpl.class);
-        bean.weatherDataProcess(context, input.getKeyName());
+//        BaseWeatherCloudServiceImpl bean = context.getBean(BaseWeatherCloudServiceImpl.class);
+//        bean.weatherDataProcess(context, input.getKeyName());
 //        WindPredictionHistoryCloudServiceImpl bean = context.getBean(WindPredictionHistoryCloudServiceImpl.class);
 //        bean.windPredictionHistoryJob(context);
 //        ThirdWindPowerGenerationCloudServiceImpl bean = context.getBean(ThirdWindPowerGenerationCloudServiceImpl.class);

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java

@@ -58,12 +58,12 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
     public XServiceResult test(XContext context) {
         XThreadHelper.async(() -> {
             context.getLogger().info("------------- optimize space begin -------------");
+            SpaceOptimizeUltraCloudServiceImpl bean3 = context.getBean(SpaceOptimizeUltraCloudServiceImpl.class);
+            bean3.optimizeUltraJob(context);
             SpaceOptimizeLongCloudServiceImpl bean = context.getBean(SpaceOptimizeLongCloudServiceImpl.class);
             bean.optimizeLongJob(context);
             SpaceOptimizeMidCloudServiceImpl bean1 = context.getBean(SpaceOptimizeMidCloudServiceImpl.class);
             bean1.optimizeMidJob(context);
-            SpaceOptimizeUltraCloudServiceImpl bean3 = context.getBean(SpaceOptimizeUltraCloudServiceImpl.class);
-            bean3.optimizeUltraJob(context);
             SpaceOptimizeShortCloudServiceImpl bean2 = context.getBean(SpaceOptimizeShortCloudServiceImpl.class);
             bean2.optimizeShortJob(context);
             context.getLogger().info("------------- optimize space end -------------");

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

@@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
+import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
+import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantInput;
@@ -80,8 +82,11 @@ public class EnergyConsumptionAnalysisService {
     @XText("间开效果评价--场站分析")
     @XApiPost
     public XPageResult<GetWellheadAnalysisOutput> wellStatisticsPage(XContext context, GetStatisticsPageInput input) {
-        Set<String> lineNameSet = this.getLineNameSet(context, input.getOuId());
-        if (CollUtil.isNotEmpty(lineNameSet)) {
+        List<GetBasePhotovoltaicPlantCloudOutput> plantList = ServiceUtil.getBasePhotovoltaicPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
+                .stationName(input.getWellNumber())
+                .ouIds(ServiceUtil.getOrgIdsByPath(context, input.getOuId()))
+                .build());
+        if (CollUtil.isNotEmpty(plantList)) {
             //日期初始化
             input.getBetweenDate();
             Date beginTime = input.getBeginTime();
@@ -94,7 +99,9 @@ public class EnergyConsumptionAnalysisService {
                     .beginTime(beginTime)
                     .endTime(endTime)
                     .stationName(input.getWellNumber())
-                    .stationNameList(lineNameSet)
+                    .stationNameList(plantList.stream()
+                            .map(GetBasePhotovoltaicPlantCloudOutput::getStationName)
+                            .collect(Collectors.toSet()))
                     .month(now.monthBaseOne())
                     .year(now.year())
                     .build());