Commit 4033f1a2 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 8057a92d
...@@ -561,10 +561,12 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -561,10 +561,12 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//按照权重降序排序 //按照权重降序排序
replenishList.sort((o1, o2) -> o2.getWeight() - o1.getWeight()); replenishList.sort((o1, o2) -> o2.getWeight() - o1.getWeight());
//遍历,补时间 //遍历,补时间
SpaceOptimizeDurationDTO durationDTO;
for (SpaceOptimizeWeightDuration replenish : replenishList) { for (SpaceOptimizeWeightDuration replenish : replenishList) {
if (subMinute <= 0) {
break;
}
//取需要优化的时间段 //取需要优化的时间段
durationDTO = optimizeDurationDTOList.get(replenish.getOptimizeIndex()); SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(replenish.getOptimizeIndex());
//计算剩余可开井时长 //计算剩余可开井时长
long remainOpenMinute = maxOpenMinute - DateUtil.between(durationDTO.getOpenTime(), durationDTO.getCloseTime(), DateUnit.MINUTE); long remainOpenMinute = maxOpenMinute - DateUtil.between(durationDTO.getOpenTime(), durationDTO.getCloseTime(), DateUnit.MINUTE);
//取可优化时间段 //取可优化时间段
...@@ -592,9 +594,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -592,9 +594,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
subMinute -= remainOpenMinute; subMinute -= remainOpenMinute;
} }
} }
System.out.println();
} }
System.out.println();
} else { } else {
//todo : 没法补时间 //todo : 没法补时间
} }
......
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