Skip to content

G
gf_back
Commit 0b39a2d6 authored by ZWT's avatar ZWT
Browse files
Options

得到的

parent c70a3649
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/WindPredictionFutureService.java
View file @ 0b39a2d6
...@@ -772,12 +772,12 @@ public class WindPredictionFutureService { ...@@ -772,12 +772,12 @@ public class WindPredictionFutureService {
String property = context.getProperty("x.db.databaseId"); String property = context.getProperty("x.db.databaseId");
switch (property) { switch (property) {
case "Oracle": case "Oracle":
queryWrapper.select("data_time", "NVL( MAX( actual_power ), 0 ) AS predicted_power", 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"); "NVL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "NVL( MAX( WIND_SPEED ), 0 ) AS WIND_SPEED");
break; break;
default: default:
queryWrapper.select("data_time", "IFNULL( MAX( actual_power ), 0 ) AS predicted_power", 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"); "IFNULL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "IFNULL( MAX( WIND_SPEED ), 0 ) AS WIND_SPEED");
} }
WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class); WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class);
List<WindPredictionFutureEnt> predictedList = mapper.selectList(queryWrapper List<WindPredictionFutureEnt> predictedList = mapper.selectList(queryWrapper
...@@ -814,10 +814,10 @@ public class WindPredictionFutureService { ...@@ -814,10 +814,10 @@ public class WindPredictionFutureService {
String property = context.getProperty("x.db.databaseId"); String property = context.getProperty("x.db.databaseId");
switch (property) { switch (property) {
case "Oracle": case "Oracle":
queryWrapper.select("data_time", "NVL( SUM( actual_power ), 0 ) AS predicted_power"); queryWrapper.select("DATA_TIME", "NVL( SUM( ACTUAL_POWER ), 0 ) AS PREDICTED_POWER");
break; break;
default: default:
queryWrapper.select("data_time", "IFNULL( SUM( actual_power ), 0 ) AS predicted_power"); queryWrapper.select("DATA_TIME", "IFNULL( SUM( ACTUAL_POWER ), 0 ) AS PREDICTED_POWER");
} }
WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class); WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class);
List<WindPredictionFutureEnt> predictedList = mapper.selectList(queryWrapper List<WindPredictionFutureEnt> predictedList = mapper.selectList(queryWrapper
...@@ -878,14 +878,14 @@ public class WindPredictionFutureService { ...@@ -878,14 +878,14 @@ public class WindPredictionFutureService {
String property = context.getProperty("x.db.databaseId"); String property = context.getProperty("x.db.databaseId");
switch (property) { switch (property) {
case "Oracle": case "Oracle":
queryWrapper.select("collect_time", "NVL( MAX( actual_wind_speed ), 0 ) AS actual_wind_speed", "NVL( MAX( actual_power ), 0 ) AS actual_power"); queryWrapper.select("COLLECT_TIME", "NVL( MAX( ACTUAL_WIND_SPEED ), 0 ) AS ACTUAL_WIND_SPEED", "NVL( MAX( ACTUAL_POWER ), 0 ) AS ACTUAL_POWER");
break; break;
default: default:
queryWrapper.select("collect_time", "IFNULL( MAX( actual_wind_speed ), 0 ) AS actual_wind_speed", "IFNULL( MAX( actual_power ), 0 ) AS actual_power"); 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); ThirdWindPowerGenerationMapper generationMapper = context.getBean(ThirdWindPowerGenerationMapper.class);
List<ThirdWindPowerGenerationEnt> list = generationMapper.selectList(queryWrapper List<ThirdWindPowerGenerationEnt> list = generationMapper.selectList(queryWrapper
.groupBy("collect_time") .groupBy("COLLECT_TIME")
.lambda() .lambda()
.eq(ThirdWindPowerGenerationEnt::getStationId, stationId) .eq(ThirdWindPowerGenerationEnt::getStationId, stationId)
.eq(ThirdWindPowerGenerationEnt::getSystemSource, ServiceUtil.getOilFieldCode(context)) .eq(ThirdWindPowerGenerationEnt::getSystemSource, ServiceUtil.getOilFieldCode(context))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment