Commit 71e25b1c authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 4001ca4f
......@@ -501,6 +501,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//找索引开始/结束位置
int firstBeginIndex = (int) DateUtil.between(beginTime, firstCloseTime, DateUnit.MINUTE) / 30;
int firstEndIndex = (int) DateUtil.between(beginTime, DateUtil.offsetMinute(firstCloseTime, optimizeMinute), DateUnit.MINUTE) / 30;
//累加权重
int weightSum = 0;
//累加时间
long durationSum = 0;
int endIndex = firstBeginIndex;
//取时间段
for (int i2 = firstBeginIndex; i2 <= firstEndIndex; i2++) {
SpaceOptimizeWeight optimizeWeight = weightList.get(i2);
......@@ -509,11 +514,24 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
if (i3 < 0) {
continue;
}
int weight1 = optimizeWeight.getWeight();
if (0 == optimizeWeight.getWeight()) {
break;
}
weightSum += optimizeWeight.getWeight();
endIndex = i2;
durationSum += 30;
}
if (endIndex > firstBeginIndex) {
replenishList.add(
SpaceOptimizeWeightDuration.builder()
.openIndex(firstBeginIndex)
.closeIndex(endIndex)
.weight(weightSum)
.duration(durationSum)
.build()
);
}
}
long secondOpenMinute = DateUtil.between(secondOpenTime, secondCloseTime, DateUnit.MINUTE);
int secondBeginIndex = (int) DateUtil.between(beginTime, secondOpenTime, DateUnit.MINUTE) / 30;
......
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