得到的

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/LineDailyElectricityTrendViewMapper.xml

@@ -142,7 +142,7 @@
     </resultMap>
 
     <select id="selectValleyElectricRate" parameterType="pps.core.space.entity.LineDailyElectricityTrendView"
-            resultMap="ExtResultMap">
+            resultMap="ExtResultMap" databaseId="MySQL">
         SELECT
         Z.DAY_FLAG,
         IFNULL( ROUND( Z.VALLEY_ELECTRIC_OPEN_HOUR / Z.SUM_RUN_DURATION * 100, 2 ), 0 ) AS VALLEY_ELECTRIC_RATE
@@ -191,4 +191,59 @@
         </foreach>
         ) Z
     </select>
+
+    <select id="selectValleyElectricRate" parameterType="pps.core.space.entity.LineDailyElectricityTrendView"
+            resultMap="ExtResultMap" databaseId="Oracle">
+        SELECT
+        Z.DAY_FLAG,
+        CASE
+        Z.SUM_RUN_DURATION
+        WHEN 0 THEN
+        0 ELSE NVL( ROUND( Z.VALLEY_ELECTRIC_OPEN_HOUR / Z.SUM_RUN_DURATION * 100, 2 ), 0 )
+        END VALLEY_ELECTRIC_RATE
+        FROM
+        (
+        SELECT
+        NVL( SUM( VALLEY_ELECTRIC_OPEN_HOUR ), 0 ) AS VALLEY_ELECTRIC_OPEN_HOUR,
+        NVL( SUM( SUM_RUN_DURATION ), 0 ) AS SUM_RUN_DURATION,
+        1 AS DAY_FLAG
+        FROM
+        LINE_DAILY_ELECTRICITY_TREND
+        WHERE
+        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) = TO_CHAR( #{createDate}, 'YYYY-MM-DD HH24' )
+        AND SYSTEM_SOURCE = #{systemSource}
+        AND STATION_NAME IN
+        <foreach collection="stationNameList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        UNION ALL
+        SELECT
+        NVL( SUM( VALLEY_ELECTRIC_OPEN_HOUR ), 0 ) AS VALLEY_ELECTRIC_OPEN_HOUR,
+        NVL( SUM( SUM_RUN_DURATION ), 0 ) AS SUM_RUN_DURATION,
+        2 AS DAY_FLAG
+        FROM
+        LINE_DAILY_ELECTRICITY_TREND
+        WHERE
+        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) = TO_CHAR( #{startTime}, 'YYYY-MM-DD HH24' )
+        AND SYSTEM_SOURCE = #{systemSource}
+        AND STATION_NAME IN
+        <foreach collection="stationNameList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        UNION ALL
+        SELECT
+        NVL( SUM( VALLEY_ELECTRIC_OPEN_HOUR ), 0 ) AS VALLEY_ELECTRIC_OPEN_HOUR,
+        NVL( SUM( SUM_RUN_DURATION ), 0 ) AS SUM_RUN_DURATION,
+        3 AS DAY_FLAG
+        FROM
+        LINE_DAILY_ELECTRICITY_TREND
+        WHERE
+        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) = TO_CHAR( #{endTime}, 'YYYY-MM-DD HH24' )
+        AND SYSTEM_SOURCE = #{systemSource}
+        AND STATION_NAME IN
+        <foreach collection="stationNameList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        ) Z
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -601,18 +601,13 @@ public class EnergyConsumptionAnalysisService {
                     .map(DynamicQueryBasePowerLinePlantViewOutput::getStationName)
                     .collect(Collectors.toList());
             ThirdDailyAccumulationUpdateViewMapper mapper = context.getBean(ThirdDailyAccumulationUpdateViewMapper.class);
-            List<ThirdDailyAccumulationUpdateView> viewList = null;
-            try {
-                viewList = mapper.selectPowerStatisticsByDate(ThirdDailyAccumulationUpdateView.builder()
-                        .today(today)
-                        .yesterday(DateUtil.beginOfDay(DateUtil.yesterday()))
-                        .lastYear(DateUtil.offset(today, DateField.YEAR, -1))
-                        .stationNameList(collect)
-                        .systemSource(oilFieldCode)
-                        .build());
-            } catch (RuntimeException e) {
-                System.out.println();
-            }
+            List<ThirdDailyAccumulationUpdateView> viewList = mapper.selectPowerStatisticsByDate(ThirdDailyAccumulationUpdateView.builder()
+                    .today(today)
+                    .yesterday(DateUtil.beginOfDay(DateUtil.yesterday()))
+                    .lastYear(DateUtil.offset(today, DateField.YEAR, -1))
+                    .stationNameList(collect)
+                    .systemSource(oilFieldCode)
+                    .build());
             outputs = XCopyUtils.copyNewList(viewList, PowerStatisticsOutput.class);
             //谷电占比
             if (BusinessConstant.ENV_SY.equals(oilFieldCode)) {

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

@@ -147,7 +147,7 @@
         1 AS DAY_FLAG
         FROM THIRD_DAILY_ACCUMULATION_UPDATE
         WHERE
-        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) || ':00:00' = #{today}
+        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) = TO_CHAR( #{today}, 'YYYY-MM-DD HH24' )
         AND SYSTEM_SOURCE = #{systemSource}
         AND STATION_NAME IN
         <foreach collection="stationNameList" open="(" close=")" separator="," item="item">
@@ -160,7 +160,7 @@
         2 AS DAY_FLAG
         FROM THIRD_DAILY_ACCUMULATION_UPDATE
         WHERE
-        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) || ':00:00' = #{yesterday}
+        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) = TO_CHAR( #{yesterday}, 'YYYY-MM-DD HH24' )
         AND SYSTEM_SOURCE = #{systemSource}
         AND STATION_NAME IN
         <foreach collection="stationNameList" open="(" close=")" separator="," item="item">
@@ -173,7 +173,7 @@
         3 AS DAY_FLAG
         FROM THIRD_DAILY_ACCUMULATION_UPDATE
         WHERE
-        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) || ':00:00' = #{lastYear}
+        TO_CHAR( CREATE_DATE, 'YYYY-MM-DD HH24' ) = TO_CHAR( #{lastYear}, 'YYYY-MM-DD HH24' )
         AND SYSTEM_SOURCE = #{systemSource}
         AND STATION_NAME IN
         <foreach collection="stationNameList" open="(" close=")" separator="," item="item">