Commit 9ff1d94e authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c3f6ad6d
...@@ -389,6 +389,7 @@ public class SpaceOptimizeBaseService { ...@@ -389,6 +389,7 @@ public class SpaceOptimizeBaseService {
avg.setBatteryLowFlag(true); avg.setBatteryLowFlag(true);
} }
} }
String startTimeFlag = null;
//拆分时间段 //拆分时间段
for (SpaceOptimizeDurationDTO durationDTO : offGridPeriodList) { for (SpaceOptimizeDurationDTO durationDTO : offGridPeriodList) {
Date openTime = durationDTO.getOpenTime(); Date openTime = durationDTO.getOpenTime();
...@@ -404,6 +405,9 @@ public class SpaceOptimizeBaseService { ...@@ -404,6 +405,9 @@ public class SpaceOptimizeBaseService {
if (createTime.compareTo(openTime) >= 0 && createTime.compareTo(closeTime) <= 0) { if (createTime.compareTo(openTime) >= 0 && createTime.compareTo(closeTime) <= 0) {
String endString = createTime.offsetNew(DateField.MINUTE, 15).toString(BusinessConstant.MINUTES_FORMAT); String endString = createTime.offsetNew(DateField.MINUTE, 15).toString(BusinessConstant.MINUTES_FORMAT);
String startString = createTime.toString(BusinessConstant.MINUTES_FORMAT); String startString = createTime.toString(BusinessConstant.MINUTES_FORMAT);
if (StringUtils.equals(startString, startTimeFlag)) {
continue;
}
if (StringUtils.equals(endString, BusinessConstant.START_OF_DAY_TIME)) { if (StringUtils.equals(endString, BusinessConstant.START_OF_DAY_TIME)) {
endString = BusinessConstant.END_OF_DAY_TIME; endString = BusinessConstant.END_OF_DAY_TIME;
} }
...@@ -430,6 +434,7 @@ public class SpaceOptimizeBaseService { ...@@ -430,6 +434,7 @@ public class SpaceOptimizeBaseService {
); );
} }
} }
startTimeFlag = startString;
} }
} }
} }
......
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