Commit d6d715e1 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;
3.长庆极短期间开优化随动算法功能开发,设置自定义参数,初步完成极短时间,间开时间段优化测试功能;
4.间开制度管理模块,间开制度关联井口信息表表结构修改,增加"单次最高开井时长(h)","单次最低开井时长(h)","单次最高关井时长(h)","单次最低关井时长(h)"字段,同时修改数据表对应代码实体及表单参数,修改部分相关模块功能查询修改逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 48a94f34
...@@ -400,13 +400,13 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -400,13 +400,13 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//偏移开/关井时间 //偏移开/关井时间
if (CollUtil.isNotEmpty(optimizeDurationDTOList)) { if (CollUtil.isNotEmpty(optimizeDurationDTOList)) {
SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1); SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
Date lastOpenTime = optimizeDurationDTOList.get(0).getOpenTime(); Date firstOpenTime = optimizeDurationDTOList.get(0).getOpenTime();
Date lastCloseTime = durationDTO.getCloseTime(); Date lastCloseTime = durationDTO.getCloseTime();
long l; long l;
//如果关井时间在第一次开井时间之前,判断是否需要偏移关井时间 //如果关井时间在第一次开井时间之前,判断是否需要偏移关井时间
if (DateUtil.compare(lastOpenTime, closeTime) >= 0) { if (DateUtil.compare(firstOpenTime, closeTime) >= 0) {
forwardFlag = false; forwardFlag = false;
l = closeTime.between(lastOpenTime, DateUnit.MINUTE); l = closeTime.between(firstOpenTime, DateUnit.MINUTE);
long l1 = l - minCloseMinute; long l1 = l - minCloseMinute;
//小于0,说明不满足最小停井时间,需要补 //小于0,说明不满足最小停井时间,需要补
if (l1 < 0) { if (l1 < 0) {
......
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