Commit 8057a92d authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 49ba9b1e
...@@ -574,20 +574,24 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -574,20 +574,24 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
long replenishDuration = DateUtil.between(startTime, endTime, DateUnit.MINUTE); long replenishDuration = DateUtil.between(startTime, endTime, DateUnit.MINUTE);
//判断是否可以满足全部优化 //判断是否可以满足全部优化
if (replenishDuration >= subMinute) { if (replenishDuration >= subMinute) {
//可开井时间大于等于需要优化时长
if (remainOpenMinute >= subMinute) { if (remainOpenMinute >= subMinute) {
this.overtime(durationDTO, endTime, (int) subMinute);
break; break;
} else { } else {
this.overtime(durationDTO, endTime, (int) remainOpenMinute);
subMinute -= remainOpenMinute; subMinute -= remainOpenMinute;
} }
} else { } else {
//可开井时间大于等于可优化时长
subMinute -= replenishDuration; if (remainOpenMinute >= replenishDuration) {
this.overtime(durationDTO, endTime, (int) replenishDuration);
subMinute -= replenishDuration;
} else {
this.overtime(durationDTO, endTime, (int) remainOpenMinute);
subMinute -= remainOpenMinute;
}
} }
System.out.println(); System.out.println();
} }
System.out.println(); System.out.println();
...@@ -600,6 +604,24 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -600,6 +604,24 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
return XServiceResult.OK; return XServiceResult.OK;
} }
/**
* 加时
*
* @param durationDTO 持续时间dto
* @param endTime 结束时间
* @param minute 分钟
*/
private void overtime(SpaceOptimizeDurationDTO durationDTO, DateTime endTime, int minute) {
//判断向前补还是向后补
if (DateUtil.compare(durationDTO.getOpenTime(), endTime) == 0) {
//向前补
durationDTO.setOpenTime(DateUtil.offsetMinute(durationDTO.getOpenTime(), -minute));
} else {
//向后补
durationDTO.setCloseTime(DateUtil.offsetMinute(durationDTO.getCloseTime(), minute));
}
}
/** /**
* 通过时段类型获取权重 * 通过时段类型获取权重
* *
......
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