Commit 351f5e2d authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7d5f2450
...@@ -72,10 +72,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -72,10 +72,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
@XText("极短期间开优化--动态优化") @XText("极短期间开优化--动态优化")
public XServiceResult dynamicOptimize(XContext context) { public XServiceResult dynamicOptimize(XContext context) {
//测试用 ====== start //测试用 ====== start
int dayOpen = 15;
int maxOpen = 10; int maxOpen = 10;
int minOpen = 3; int minOpen = 3;
int maxClose = 6; int maxClose = 2;
int minClose = 2; int minClose = 1;
//测试用 ====== end //测试用 ====== end
List<SpaceOptimizePeriodDTO> periodDTOList = new ArrayList<>(32); List<SpaceOptimizePeriodDTO> periodDTOList = new ArrayList<>(32);
List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64); List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
...@@ -282,12 +283,45 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -282,12 +283,45 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
startIndex = i1; startIndex = i1;
} }
} }
//计算第一次启动时间之后的开井时间段 //分级取时间段
DateTime openTime = weightList.get(startIndex).getTimestamp(); List<SpaceOptimizeDurationDTO> periodList = new ArrayList<>(32);
DateTime closeTime = openTime; int[] ladder = {10, 5, 3, 1};
for (int i1 = (startIndex + 1); i1 < weightList.size(); i1++) { for (int i1 = 0; i1 < ladder.length; i1++) {
//如果权重大于当前最大权重,跳过
if (weightNum < ladder[i1]) {
continue;
}
int begin = -1;
//取每级时间
for (int i2 = 0; i2 < weightList.size(); i2++) {
weight = weightList.get(i2);
//过滤条件:权重相同
if (ladder[i1] == weight.getWeight()) {
//确定开始时间位置
if (begin == -1) {
begin = i2;
}
//如果索引小于第一次开井时间,则算为第二天
if (i2 < startIndex) {
}
} else if (begin != -1) {
//创建区间
periodList.add(
SpaceOptimizeDurationDTO.builder()
.openTime(weightList.get(begin).getTimestamp())
.closeTime(weightList.get(i2).getTimestamp())
.build()
);
begin = -1;
}
}
System.out.println();
} }
} }
} }
return XServiceResult.OK; return XServiceResult.OK;
......
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