得到的

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

@@ -770,12 +770,10 @@ public class WindPredictionFutureService {
     private Map<Date, WindPredictionFutureEnt> getPredictedMap(XContext context, String stationId, DateTime beginTime, DateTime endTime) {
         QueryWrapper<WindPredictionFutureEnt> queryWrapper = new QueryWrapper<>();
         String property = context.getProperty("x.db.databaseId");
-        switch (property) {
-            case "Oracle":
+        if (CharSequenceUtil.equals(property, "Oracle")) {
             queryWrapper.select("DATA_TIME", "NVL( MAX( ACTUAL_POWER ), 0 ) AS PREDICTED_POWER",
                     "NVL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "NVL( MAX( WIND_SPEED ), 0 ) AS WIND_SPEED");
-                break;
-            default:
+        } else {
             queryWrapper.select("DATA_TIME", "IFNULL( MAX( ACTUAL_POWER ), 0 ) AS PREDICTED_POWER",
                     "IFNULL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "IFNULL( MAX( WIND_SPEED ), 0 ) AS WIND_SPEED");
         }
@@ -812,11 +810,9 @@ public class WindPredictionFutureService {
     private Map<Date, BigDecimal> getPredictedMap(XContext context, List<String> stationIds, Date beginTime, Date endTime) {
         QueryWrapper<WindPredictionFutureEnt> queryWrapper = new QueryWrapper<>();
         String property = context.getProperty("x.db.databaseId");
-        switch (property) {
-            case "Oracle":
+        if (CharSequenceUtil.equals(property, "Oracle")) {
             queryWrapper.select("DATA_TIME", "NVL( SUM( ACTUAL_POWER ), 0 ) AS PREDICTED_POWER");
-                break;
-            default:
+        } else {
             queryWrapper.select("DATA_TIME", "IFNULL( SUM( ACTUAL_POWER ), 0 ) AS PREDICTED_POWER");
         }
         WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class);
@@ -876,11 +872,9 @@ public class WindPredictionFutureService {
     private Map<Date, ThirdWindPowerGenerationEnt> getActivePower15MinuteMap(XContext context, String stationId, DateTime beginTime, DateTime endTime) {
         QueryWrapper<ThirdWindPowerGenerationEnt> queryWrapper = new QueryWrapper<>();
         String property = context.getProperty("x.db.databaseId");
-        switch (property) {
-            case "Oracle":
+        if (CharSequenceUtil.equals(property, "Oracle")) {
             queryWrapper.select("COLLECT_TIME", "NVL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "NVL( MAX( ACTUAL_POWER ), 0 ) AS ACTUAL_POWER");
-                break;
-            default:
+        } else {
             queryWrapper.select("COLLECT_TIME", "IFNULL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "IFNULL( MAX( ACTUAL_POWER ), 0 ) AS ACTUAL_POWER");
         }
         ThirdWindPowerGenerationMapper generationMapper = context.getBean(ThirdWindPowerGenerationMapper.class);