Skip to content

G
gf_back
Commit 9b39cc82 authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 测试问题修复 

1.修改间开制度管理--长期间开优化模块详情接口,优化已优化时间列表查询逻辑;
2.修改间开制度管理--中短期间开优化模块详情接口,优化已优化时间列表查询逻辑;
3.修改间开制度管理--定期校准模块重新校准接口,增加时间限制,超过优化时间不能优化;
4.修改间开制度管理--长期/中短期间开优化离网型算法,优化数据结构;
5.修改间开制度管理--设为基础制度及重新优化接口,解决部分数据没有默认值导致接口保存失败问题;
6.修改间开制度管理--间开制度详情接口,解决查询出其它井口问题;
7.修改基础信息配置--输电线路配置模块通过线路ID查询线路下井口列表接口,修改排序方式;
8.修改间开制度管理--优化间开优化功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 13563842
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 48 deletions
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PlantPredictedPowerCloudServiceImpl.java
View file @ 9b39cc82
...@@ -44,54 +44,56 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower ...@@ -44,54 +44,56 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
String endTime = input.getEndTime(); String endTime = input.getEndTime();
Integer dateType = input.getDateType(); Integer dateType = input.getDateType();
List list = null; List list = null;
switch (dateType) { if (CollUtil.isNotEmpty(plantIds)) {
case 0: switch (dateType) {
PlantPredictedPowerLongTermDataMapper longTermDataMapper = context.getBean(PlantPredictedPowerLongTermDataMapper.class); case 0:
list = longTermDataMapper.selectList( PlantPredictedPowerLongTermDataMapper longTermDataMapper = context.getBean(PlantPredictedPowerLongTermDataMapper.class);
new QueryWrapper<PlantPredictedPowerLongTermDataEnt>() list = longTermDataMapper.selectList(
.select("year_time", new QueryWrapper<PlantPredictedPowerLongTermDataEnt>()
"month_time", .select("year_time",
"hour_time", "month_time",
"min_time", "hour_time",
"IFNULL( AVG( power ), 0 ) AS power", "min_time",
"STR_TO_DATE( CONCAT( hour_time, ':', min_time ), '%H:%i:%s' ) AS create_time") "IFNULL( AVG( power ), 0 ) AS power",
.lambda() "STR_TO_DATE( CONCAT( hour_time, ':', min_time ), '%H:%i:%s' ) AS create_time")
.eq(StringUtils.isNotBlank(plantId), PlantPredictedPowerLongTermDataEnt::getPlantId, plantId) .lambda()
.in(CollUtil.isNotEmpty(plantIds), PlantPredictedPowerLongTermDataEnt::getPlantId, plantIds) .eq(StringUtils.isNotBlank(plantId), PlantPredictedPowerLongTermDataEnt::getPlantId, plantId)
.eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerLongTermDataEnt::getYearTime, yearTime) .in(PlantPredictedPowerLongTermDataEnt::getPlantId, plantIds)
.eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerLongTermDataEnt::getMonthTime, monthTime) .eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerLongTermDataEnt::getYearTime, yearTime)
.between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerLongTermDataEnt::getDataDate, startTime, endTime) .eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerLongTermDataEnt::getMonthTime, monthTime)
.groupBy(PlantPredictedPowerLongTermDataEnt::getYearTime, .between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerLongTermDataEnt::getDataDate, startTime, endTime)
PlantPredictedPowerLongTermDataEnt::getMonthTime, .groupBy(PlantPredictedPowerLongTermDataEnt::getYearTime,
PlantPredictedPowerLongTermDataEnt::getHourTime, PlantPredictedPowerLongTermDataEnt::getMonthTime,
PlantPredictedPowerLongTermDataEnt::getMinTime) PlantPredictedPowerLongTermDataEnt::getHourTime,
.orderByAsc(PlantPredictedPowerLongTermDataEnt::getHourTime, PlantPredictedPowerLongTermDataEnt::getMinTime) PlantPredictedPowerLongTermDataEnt::getMinTime)
); .orderByAsc(PlantPredictedPowerLongTermDataEnt::getHourTime, PlantPredictedPowerLongTermDataEnt::getMinTime)
break; );
case 1: break;
PlantPredictedPowerDataMapper mapper = context.getBean(PlantPredictedPowerDataMapper.class); case 1:
list = mapper.selectList( PlantPredictedPowerDataMapper mapper = context.getBean(PlantPredictedPowerDataMapper.class);
new QueryWrapper<PlantPredictedPowerDataEnt>() list = mapper.selectList(
.select("year_time", new QueryWrapper<PlantPredictedPowerDataEnt>()
"month_time", .select("year_time",
"hour_time", "month_time",
"min_time", "hour_time",
"IFNULL( AVG( power ), 0 ) AS power", "min_time",
"STR_TO_DATE( CONCAT( hour_time, ':', min_time ), '%H:%i:%s' ) AS create_time") "IFNULL( AVG( power ), 0 ) AS power",
.lambda() "STR_TO_DATE( CONCAT( hour_time, ':', min_time ), '%H:%i:%s' ) AS create_time")
.eq(StringUtils.isNotBlank(plantId), PlantPredictedPowerDataEnt::getPlantId, plantId) .lambda()
.in(CollUtil.isNotEmpty(plantIds), PlantPredictedPowerDataEnt::getPlantId, plantIds) .eq(StringUtils.isNotBlank(plantId), PlantPredictedPowerDataEnt::getPlantId, plantId)
.eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerDataEnt::getYearTime, yearTime) .in(PlantPredictedPowerDataEnt::getPlantId, plantIds)
.eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerDataEnt::getMonthTime, monthTime) .eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerDataEnt::getYearTime, yearTime)
.between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerDataEnt::getDataDate, startTime, endTime) .eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerDataEnt::getMonthTime, monthTime)
.groupBy(PlantPredictedPowerDataEnt::getYearTime, .between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerDataEnt::getDataDate, startTime, endTime)
PlantPredictedPowerDataEnt::getMonthTime, .groupBy(PlantPredictedPowerDataEnt::getYearTime,
PlantPredictedPowerDataEnt::getHourTime, PlantPredictedPowerDataEnt::getMonthTime,
PlantPredictedPowerDataEnt::getMinTime) PlantPredictedPowerDataEnt::getHourTime,
.orderByAsc(PlantPredictedPowerDataEnt::getHourTime, PlantPredictedPowerDataEnt::getMinTime) PlantPredictedPowerDataEnt::getMinTime)
); .orderByAsc(PlantPredictedPowerDataEnt::getHourTime, PlantPredictedPowerDataEnt::getMinTime)
break; );
default: break;
default:
}
} }
List<DynamicQueryPlantPredictedPowerOutput> outputs; List<DynamicQueryPlantPredictedPowerOutput> outputs;
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
......
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