Commit 842fe6ae authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent f5ff7812
......@@ -364,7 +364,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
openTime = weightDuration.getOpenTime();
//偏移开井时间
DateTime closeTime = weightDuration.getCloseTime();
if (optimizeDurationDTOList.size() > 0) {
if (CollUtil.isNotEmpty(optimizeDurationDTOList)) {
Date lastCloseTime = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1).getCloseTime();
//计算当前开井时间和上一次关井时间的时间间隔
long l = openTime.between(lastCloseTime, DateUnit.MINUTE);
......@@ -387,7 +387,6 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
duration += l1;
if (duration < minOpenMinute) {
//偏移关井时间
// closeTime = closeTime.offsetNew(DateField.MINUTE, (int) -l1);
continue;
}
}
......
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