得到的

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

@@ -3,6 +3,7 @@ package pps.core.space.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -114,11 +115,16 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
      */
     @Override
     public XSingleResult<GetMonthlyWellCountOutput> monthlyWellCount(XContext context, GetMonthlyWellCountInput input) {
+        QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
+        if (CharSequenceUtil.equals(context.getProperty("x.db.databaseId"), BusinessConstant.ORACLE)) {
+            queryWrapper.select("DISTINCT WELL_NUMBER")
+                    .apply("EXTRACT( YEAR FROM OPTIMIZE_DATE ) = {0}", input.getMonth());
+        } else {
+            queryWrapper.select("DISTINCT WELL_NUMBER")
+                    .apply("MONTH ( OPTIMIZE_DATE ) = {0}", input.getMonth());
+        }
         SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
-        Long count = mapper.selectCount(new QueryWrapper<SpaceOptimizeShortWellheadEnt>()
-                .select("DISTINCT well_number")
-                .apply("MONTH ( optimize_date ) = {0}", input.getMonth())
-        );
+        Long count = mapper.selectCount(queryWrapper);
         return XSingleResult.success(GetMonthlyWellCountOutput.builder()
                 .wellNumber(count)
                 .build());

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

@@ -91,7 +91,7 @@
     </resultMap>
 
     <select id="selectWellheadAnalysisPage" parameterType="pps.core.space.entity.WellDailyElectricityTrendView"
-            resultMap="ExtResultMap">
+            resultMap="ExtResultMap" databaseId="MySQL">
         SELECT
         Z.*
         FROM
@@ -153,4 +153,68 @@
         ORDER BY
         Z.WELL_NUMBER
     </select>
+
+    <select id="selectWellheadAnalysisPage" parameterType="pps.core.space.entity.WellDailyElectricityTrendView"
+            resultMap="ExtResultMap" databaseId="Oracle">
+        SELECT
+        Z.*
+        FROM
+        (
+        SELECT T.WELL_NUMBER,
+        T.SPACE_RUN_DURATION,
+        T.DAILY_LIQUID_PRODUCTION,
+        T.GREEN_ELECTRICITY_RATE,
+        T.DAILY_CARBON_REDUCTION,
+        T.VALLEY_ELECTRIC_RATE,
+        M.MONTH_DAILY_GREEN_OPEN_HOUR,
+        M.MONTH_SPACE_RUN_DURATION,
+        M.MONTH_DAILY_GREEN_CONSUMPTION,
+        M.MONTH_VALLEY_ELECTRIC_OPEN_HOUR,
+        Y.YEAR_DAILY_GREEN_OPEN_HOUR,
+        Y.YEAR_SPACE_RUN_DURATION,
+        Y.YEAR_DAILY_GREEN_CONSUMPTION,
+        Y.YEAR_VALLEY_ELECTRIC_OPEN_HOUR
+        FROM WELL_DAILY_ELECTRICITY_TREND T
+        LEFT JOIN (SELECT WELL_NUMBER,
+        SUM(DAILY_GREEN_OPEN_HOUR) AS MONTH_DAILY_GREEN_OPEN_HOUR,
+        SUM(SPACE_RUN_DURATION) AS MONTH_SPACE_RUN_DURATION,
+        SUM(DAILY_GREEN_CONSUMPTION) AS MONTH_DAILY_GREEN_CONSUMPTION,
+        SUM(VALLEY_ELECTRIC_OPEN_HOUR) AS MONTH_VALLEY_ELECTRIC_OPEN_HOUR
+        FROM WELL_DAILY_ELECTRICITY_TREND
+        WHERE
+        EXTRACT( MONTH FROM CREATE_DATE ) = #{month}
+        AND WELL_NUMBER IN
+        <foreach collection="wellNumberList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        GROUP BY
+        WELL_NUMBER) M ON T.WELL_NUMBER = M.WELL_NUMBER
+        LEFT JOIN (SELECT WELL_NUMBER,
+        SUM(DAILY_GREEN_OPEN_HOUR) AS YEAR_DAILY_GREEN_OPEN_HOUR,
+        SUM(SPACE_RUN_DURATION) AS YEAR_SPACE_RUN_DURATION,
+        SUM(DAILY_GREEN_CONSUMPTION) AS YEAR_DAILY_GREEN_CONSUMPTION,
+        SUM(VALLEY_ELECTRIC_OPEN_HOUR) AS YEAR_VALLEY_ELECTRIC_OPEN_HOUR
+        FROM WELL_DAILY_ELECTRICITY_TREND
+        WHERE
+        EXTRACT( YEAR FROM CREATE_DATE ) = #{year}
+        AND WELL_NUMBER IN
+        <foreach collection="wellNumberList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        GROUP BY
+        WELL_NUMBER) Y ON T.WELL_NUMBER = Y.WELL_NUMBER
+        WHERE T.CREATE_DATE = #{createDate}
+        AND T.WELL_NUMBER IN
+        <foreach collection="wellNumberList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        ) Z
+        <where>
+            <if test="wellNumber != null and wellNumber != ''">
+                AND Z.WELL_NUMBER LIKE CONCAT('%',#{wellNumber},'%')
+            </if>
+        </where>
+        ORDER BY
+        Z.WELL_NUMBER
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -1205,15 +1205,22 @@ public class EnergyConsumptionAnalysisService {
         DateTime end = DateUtil.beginOfDay(DateUtil.date());
         List<DynamicQueryBasePowerLinePlantViewOutput> plantList = ServiceUtil.getPowerLinePlantList(context, plantInput);
         if (CollUtil.isNotEmpty(plantList)) {
+            QueryWrapper<ThirdDailyAccumulationUpdateEnt> queryWrapper = new QueryWrapper<>();
+            if (CharSequenceUtil.equals(context.getProperty("x.db.databaseId"), BusinessConstant.ORACLE)) {
+                queryWrapper.select("NVL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
+                        "NVL( SUM( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption",
+                        "NVL( SUM( daily_liquid_production ), 0 ) AS daily_liquid_production",
+                        "NVL( SUM( in_place_consumption ), 0 ) AS in_place_consumption");
+            } else {
+                queryWrapper.select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
+                        "IFNULL( SUM( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption",
+                        "IFNULL( SUM( daily_liquid_production ), 0 ) AS daily_liquid_production",
+                        "IFNULL( SUM( in_place_consumption ), 0 ) AS in_place_consumption");
+            }
             DateTime start = DateUtil.beginOfMonth(end);
             //累计发电
             ThirdDailyAccumulationUpdateMapper analysisMapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
-            ThirdDailyAccumulationUpdateEnt analysisEnt = analysisMapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>()
-                    .select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
-                            "IFNULL( SUM( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption",
-                            "IFNULL( SUM( daily_liquid_production ), 0 ) AS daily_liquid_production",
-                            "IFNULL( SUM( in_place_consumption ), 0 ) AS in_place_consumption")
-                    .lambda()
+            ThirdDailyAccumulationUpdateEnt analysisEnt = analysisMapper.selectOne(queryWrapper.lambda()
                     .between(ThirdDailyAccumulationUpdateEnt::getSaveDate, start, end)
                     .in(ThirdDailyAccumulationUpdateEnt::getStationName, plantList.stream()
                             .map(DynamicQueryBasePowerLinePlantViewOutput::getStationName)