Commit 4861f4ee authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2f17d400
...@@ -345,19 +345,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -345,19 +345,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
} }
} }
} }
//时间处理并排序 //时间处理并排序(处理后第一次开井时间的索引位置为0)
weightDurationList = weightDurationList.stream() weightDurationList = weightDurationList.stream()
.sorted(Comparator.comparing(SpaceOptimizeWeightDuration::getOpenTime)) .sorted(Comparator.comparing(SpaceOptimizeWeightDuration::getOpenTime))
.collect(Collectors.toList()); .collect(Collectors.toList());
//计算第一次启动时间
int startIndex = 0;
weightNum = 0;
for (int i1 = 0; i1 < weightDurationList.size(); i1++) {
if (weightDurationList.get(i1).getWeight() > weightNum) {
weightNum = weightDurationList.get(i1).getWeight();
startIndex = i1;
}
}
List<SpaceOptimizeDurationDTO> optimizeDurationDTOList = new ArrayList<>(32); List<SpaceOptimizeDurationDTO> optimizeDurationDTOList = new ArrayList<>(32);
//从前往后算时间 //从前往后算时间
SpaceOptimizeWeightDuration weightDuration; SpaceOptimizeWeightDuration weightDuration;
...@@ -365,7 +356,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -365,7 +356,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
long sumOpenTime = 0; long sumOpenTime = 0;
long duration; long duration;
DateTime openTime; DateTime openTime;
for (int i1 = startIndex; i1 < weightDurationList.size(); i1++) { for (int i1 = 0; i1 < weightDurationList.size(); i1++) {
weightDuration = weightDurationList.get(i1); weightDuration = weightDurationList.get(i1);
duration = weightDuration.getDuration(); duration = weightDuration.getDuration();
openTime = weightDuration.getOpenTime(); openTime = weightDuration.getOpenTime();
......
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