Commit 232cc291 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 35068fa4
......@@ -458,14 +458,25 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
if (sumOpenTime >= dayOpenMinute) {
long outdo = sumOpenTime - dayOpenMinute;
if (outdo > 0) {
//如果超过最大时间,缩短结束时间(只能缩短,无法重新优化)
// SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
// durationDTO.setCloseTime(DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo));
//todo : 如果超过最大时间,缩短结束时间(只能缩短,无法重新优化)
SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
DateTime closeTimeNew = DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo);
int compare = closeTimeNew.compareTo(durationDTO.getOpenTime());
if (0 == compare) {
optimizeDurationDTOList.remove(optimizeDurationDTOList.size() - 1);
sumOpenTime -= outdo;
} else if (0 > compare) {
//todo : 需要补时间
}
}
//结束循环
break;
}
}
//判断是否需要补时间
if (sumOpenTime < dayOpenMinute) {
System.out.println();
}
System.out.println();
}
}
......
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