Commit dda672ff authored by ZWT's avatar ZWT

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

1.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,优化查询sql逻辑;
2.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,修改井口视图增加间开类型和运行类型字段;
3.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,修改井口视图增加没有区间配置的井口设置默认全关;
4.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,修改井口视图增加字段同时修改代码逻辑,增加大间开类型井口启动时间初始化计算逻辑;
5.修改间开制度管理-长期/中长期间开优化定时任务,解决优化后间开时间区间异常问题;
6.修改间开制度管理-长期/中长期间开优化定时任务,解决并网型消峰平谷策略优化后间开时间区间异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c548eff2
......@@ -741,14 +741,14 @@ public class SpaceOptimizeBaseService {
strategyDetailOutput.getStartTime(), endTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT)
);
//取时间间隔(分钟)
between = BaseUtils.getTimeDifferenceMinute(firstEndTime, endTime);
between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
}//其它井口的第一次启动时间
else {
//其它井启动时间:第一口井启动时间+启动间隔
DateTime startTimeOffset = firstStartTime.offsetNew(DateField.MINUTE, startInterval);
DateTime endTimeOffset = firstEndTime.offsetNew(DateField.MINUTE, startInterval);
//取时间间隔(分钟)
between = BaseUtils.getTimeDifferenceMinute(firstEndTime, endTime);
between = BaseUtils.getTimeDifferenceMinute(endTimeOffset, endTime);
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
startTimeOffset.toString(BusinessConstant.MINUTES_FORMAT), endTimeOffset.toString(BusinessConstant.MINUTES_FORMAT)
);
......
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