Commit 93e99fc9 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2820446e
...@@ -160,6 +160,8 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -160,6 +160,8 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
Map<Boolean, List<SpaceInstitutionWellheadView>> collect; Map<Boolean, List<SpaceInstitutionWellheadView>> collect;
//权重数组 //权重数组
int[] ladder = {10, 5, 3, 1}; int[] ladder = {10, 5, 3, 1};
//时间间隔
Integer startInterval;
for (SpaceInstitutionDetailEnt detail : detailEntList) { for (SpaceInstitutionDetailEnt detail : detailEntList) {
//创建记录 //创建记录
periodId = this.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), periodId = this.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(),
...@@ -197,6 +199,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -197,6 +199,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
Integer tundraStrategy = detail.getTundraStrategy(); Integer tundraStrategy = detail.getTundraStrategy();
BigDecimal serviceRating = BigDecimal.ZERO; BigDecimal serviceRating = BigDecimal.ZERO;
SpaceInstitutionWellheadView wellhead; SpaceInstitutionWellheadView wellhead;
//记录第一次开井时间
DateTime firstOpenWellTime = null;
startInterval = detail.getStartInterval();
for (int i = 0; i < wellheadList.size(); i++) { for (int i = 0; i < wellheadList.size(); i++) {
wellhead = wellheadList.get(i); wellhead = wellheadList.get(i);
String wellheadId = wellhead.getWellheadId(); String wellheadId = wellhead.getWellheadId();
...@@ -380,6 +385,15 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -380,6 +385,15 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
weightDuration = weightDurationList.get(i1); weightDuration = weightDurationList.get(i1);
duration = weightDuration.getDuration(); duration = weightDuration.getDuration();
openTime = weightDuration.getOpenTime(); openTime = weightDuration.getOpenTime();
//记录第一次开井时间
if (0 == i && 0 == i1) {
firstOpenWellTime = weightDuration.getOpenTime();
}
//偏移其他井口开井时间,并修改时间间隔
if (0 == openTime.compareTo(firstOpenWellTime) && i > 0 && 0 == i1) {
duration -= (long) startInterval * i;
openTime = DateUtil.offsetMinute(openTime, startInterval * i);
}
//偏移开井时间 //偏移开井时间
DateTime closeTime = weightDuration.getCloseTime(); DateTime closeTime = weightDuration.getCloseTime();
if (CollUtil.isNotEmpty(optimizeDurationDTOList)) { if (CollUtil.isNotEmpty(optimizeDurationDTOList)) {
......
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