feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -137,12 +137,12 @@ public class PlantPredictedPowerDataService {
     @XText("test")
     @XApiPost(anonymous = true)
     public XServiceResult test(XContext context, DoPlantPredictedPowerDataInput input) {
-        ThirdDataAccessCloudServiceImpl bean = context.getBean(ThirdDataAccessCloudServiceImpl.class);
-        bean.test(context);
         PlantPredictedPowerCloudServiceImpl bean1 = context.getBean(PlantPredictedPowerCloudServiceImpl.class);
         bean1.test(context);
         StationDailyCloudServiceImpl bean2 = context.getBean(StationDailyCloudServiceImpl.class);
         bean2.test(context);
+        ThirdDataAccessCloudServiceImpl bean = context.getBean(ThirdDataAccessCloudServiceImpl.class);
+        bean.test(context);
         return XServiceResult.OK;
     }
 

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/WellheadDailyProductionSituationViewMapper.xml

@@ -68,26 +68,30 @@
     <select id="selectWellDailyProductionSituationList"
             parameterType="pps.core.middle.entity.WellheadDailyProductionSituationView"
             resultMap="ExtResultMap">
-        SELECT WELL_NUMBER,
+        SELECT
+        WELL_NUMBER,
         DATA_DATE,
-        POWER_CONSUME_DAILY AS DAILY_ELECTRICITY_CONSUMPTION,
-        DAILY_UTILITY_ELECTRICITY_CONSUMPTION,
-        ELECTRICITY_CONSUMPTION_PH,
-        ELECTRICITY_CONSUMPTION_HH,
-        ELECTRICITY_CONSUMPTION_NP,
-        ELECTRICITY_CONSUMPTION_VH,
-        ELECTRICITY_CHARGE_CITY,
-        ELECTRICITY_CHARGES_PH,
-        PEAK_HOUR_TARIFF,
-        NORMAL_PERIOD_TARIFF,
-        ALLEY_HOURS_TARIFF,
-        STARTHOURS AS PRODUCTION_TIME,
-        DAILY_LIQUID_PRODUCTION
+        NVL( MAX( POWER_CONSUME_DAILY ), 0 ) AS DAILY_ELECTRICITY_CONSUMPTION,
+        NVL( MAX( DAILY_UTILITY_ELECTRICITY_CONSUMPTION ), 0 ) AS DAILY_UTILITY_ELECTRICITY_CONSUMPTION,
+        NVL( MAX( ELECTRICITY_CONSUMPTION_PH ), 0 ) AS ELECTRICITY_CONSUMPTION_PH,
+        NVL( MAX( ELECTRICITY_CONSUMPTION_HH ), 0 ) AS ELECTRICITY_CONSUMPTION_HH,
+        NVL( MAX( ELECTRICITY_CONSUMPTION_NP ), 0 ) AS ELECTRICITY_CONSUMPTION_NP,
+        NVL( MAX( ELECTRICITY_CONSUMPTION_VH ), 0 ) AS ELECTRICITY_CONSUMPTION_VH,
+        NVL( MAX( ELECTRICITY_CHARGE_CITY ), 0 ) AS ELECTRICITY_CHARGE_CITY,
+        NVL( MAX( ELECTRICITY_CHARGES_PH ), 0 ) AS ELECTRICITY_CHARGES_PH,
+        NVL( MAX( PEAK_HOUR_TARIFF ), 0 ) AS PEAK_HOUR_TARIFF,
+        NVL( MAX( NORMAL_PERIOD_TARIFF ), 0 ) AS NORMAL_PERIOD_TARIFF,
+        NVL( MAX( ALLEY_HOURS_TARIFF ), 0 ) AS ALLEY_HOURS_TARIFF,
+        NVL( MAX( STARTHOURS ), 0 ) AS PRODUCTION_TIME,
+        NVL( MAX( DAILY_LIQUID_PRODUCTION ), 0 ) AS DAILY_LIQUID_PRODUCTION
         FROM WELLHEAD_DAILY_PRODUCTION_SITUATION
         <where>
             <if test="dataDate != null">
                 DATA_DATE = #{dataDate}
             </if>
         </where>
+        GROUP BY
+        WELL_NUMBER,
+        DATA_DATE
     </select>
 </mapper>
\ No newline at end of file