Commit 99d72d3a authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;
4.排查并修复天气数据获取服务,数据处理后入库缺少数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c29be4d1
...@@ -2440,7 +2440,7 @@ public class SpaceOptimizeBaseService { ...@@ -2440,7 +2440,7 @@ public class SpaceOptimizeBaseService {
//记录下一个索引位置 //记录下一个索引位置
int indexNextRecord = 0; int indexNextRecord = 0;
//记录上一个索引位置 //记录上一个索引位置
int indexLastRecord = -1; int indexLastRecord;
for (int i1 = 0; i1 < size; i1++) { for (int i1 = 0; i1 < size; i1++) {
//计算需要补的时间 //计算需要补的时间
long wantMinute = dayOpenMinute - sumOpenTime; long wantMinute = dayOpenMinute - sumOpenTime;
...@@ -2468,17 +2468,16 @@ public class SpaceOptimizeBaseService { ...@@ -2468,17 +2468,16 @@ public class SpaceOptimizeBaseService {
nextCloseMinute = DateUtil.between(currentCloseTime, nextOpenTime, DateUnit.MINUTE); nextCloseMinute = DateUtil.between(currentCloseTime, nextOpenTime, DateUnit.MINUTE);
} }
//取上一段 //取上一段
indexLastRecord = i1 - 1;
if (indexLastRecord == -1) { if (indexLastRecord == -1) {
//如果到最后,下一段则取开头 //如果到最后,下一段则取开头
indexLastRecord = size - 1; indexLastRecord = size - 1;
} else {
indexLastRecord++;
} }
SpaceOptimizeDurationDTO last = optimizeDurationDTOList.get(indexNextRecord); SpaceOptimizeDurationDTO last = optimizeDurationDTOList.get(indexLastRecord);
Date lastCloseTime = last.getCloseTime(); Date lastCloseTime = last.getCloseTime();
//计算和上一段的关井时长 //计算和上一段的关井时长
long lastCloseMinute; long lastCloseMinute;
if (indexNextRecord == size - 1) { if (indexLastRecord == size - 1) {
//跨天计算 //跨天计算
lastCloseMinute = DateUtil.between(currentOpenTime, DateUtil.offsetDay(lastCloseTime, -1), DateUnit.MINUTE); lastCloseMinute = DateUtil.between(currentOpenTime, DateUtil.offsetDay(lastCloseTime, -1), DateUnit.MINUTE);
} else { } else {
......
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