Commit 027ebc14 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e9c90fdd
...@@ -338,44 +338,37 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -338,44 +338,37 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//判断时间间隔是否能满足最大开井时间 //判断时间间隔是否能满足最大开井时间
if (duration >= maxOpenMinute) { if (duration >= maxOpenMinute) {
//满足,判断能满足几次(最大开井时间) //满足,判断能满足几次(最大开井时间)
long count = duration / maxOpenMinute; //todo : 能力有限,只能用(最大开井时间+最小停井时间)固定范围,求不了最优排布
if (count > 0) { for (int i2 = 1; i2 <= duration / maxOpenMinute; i2++) {
//todo : 能力有限,只能用(最大开井时间+最小停井时间)固定范围,求不了最优排布 DateTime closeTime;
for (int i2 = 1; i2 <= count; i2++) { if (duration >= maxOpenMinute) {
DateTime closeTime; closeTime = openTime.offsetNew(DateField.MINUTE, maxOpenMinute);
if (duration >= maxOpenMinute) { duration = duration - maxOpenMinute - minCloseMinute;
closeTime = openTime.offsetNew(DateField.MINUTE, maxOpenMinute); } else if (duration >= minOpenMinute) {
duration = duration - maxOpenMinute - minCloseMinute; closeTime = openTime.offsetNew(DateField.MINUTE, minOpenMinute);
} else if (duration >= minOpenMinute) { duration = duration - minOpenMinute - minCloseMinute;
closeTime = openTime.offsetNew(DateField.MINUTE, minOpenMinute); } else {
duration = duration - minOpenMinute - minCloseMinute; //时间不够,舍弃
} else { break;
//时间不够,舍弃
break;
}
optimizeDurationDTOList.add(SpaceOptimizeDurationDTO.builder()
.openTime(openTime)
.closeTime(closeTime)
.build());
openTime = closeTime;
} }
} else {
//不满足,取全部
optimizeDurationDTOList.add(SpaceOptimizeDurationDTO.builder() optimizeDurationDTOList.add(SpaceOptimizeDurationDTO.builder()
.openTime(openTime) .openTime(openTime)
.closeTime(thisWeightDuration.getCloseTime()) .closeTime(closeTime)
.build()); .build());
duration = 0; openTime = closeTime;
}
//duration小于0:关井中,大于等于0,可以开井
if (duration < 0) {
} }
} else {
//不满足,取全部
optimizeDurationDTOList.add(SpaceOptimizeDurationDTO.builder()
.openTime(openTime)
.closeTime(thisWeightDuration.getCloseTime())
.build());
duration = 0;
}
System.out.println(); //duration小于0:关井中,大于等于0,可以开井
if (duration < 0) {
} 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