Commit 086ddf69 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c555f4d9
......@@ -80,6 +80,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
int maxClose = 2;
int minClose = 1;
int minOpenMinute = minOpen * 60;
int maxOpenMinute = maxOpen * 60;
int minCloseMinute = minClose * 60;
int maxCloseMinute = maxClose * 60;
int sumMinute = minCloseMinute + maxOpenMinute;
//测试用 ====== end
List<SpaceOptimizePeriodDTO> periodDTOList = new ArrayList<>(32);
List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
......@@ -321,6 +325,42 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
startIndex = i1;
}
}
List<SpaceOptimizeDurationDTO> optimizeDurationDTOList = new ArrayList<>(32);
//从前往后算时间
SpaceOptimizeWeightDuration thisWeightDuration;
SpaceOptimizeWeightDuration nextWeightDuration;
long duration;
DateTime openTime;
for (int i1 = startIndex; i1 < weightDurationList.size(); i1++) {
thisWeightDuration = weightDurationList.get(i1);
duration = thisWeightDuration.getDuration();
openTime = thisWeightDuration.getOpenTime();
if (duration > maxOpenMinute) {
//判断最大开井时间+最小停井时间是否大于时间间隔
if (sumMinute < duration) {
long count = duration / sumMinute;
for (int i2 = 1; i2 <= count; i2++) {
}
} else {
}
optimizeDurationDTOList.add(SpaceOptimizeDurationDTO.builder()
.openTime(openTime)
.closeTime(openTime.offsetNew(DateField.MINUTE, maxOpenMinute))
.build());
}
// if (i1 + 1 < weightDurationList.size()) {
// nextWeightDuration = weightDurationList.get(i1 + 1);
// }
}
}
}
return XServiceResult.OK;
......
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