Commit d4c235c5 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a1981f1d
...@@ -392,7 +392,30 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -392,7 +392,30 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
} else if (l1 > 0) { } else if (l1 > 0) {
//判断时间间隔是否超过最大停井时间 //判断时间间隔是否超过最大停井时间
if (l > maxCloseMinute) { if (l > maxCloseMinute) {
System.out.println(); //调整当前权重
if (i1 > 0) {
//计算出本次应该的开井时间
DateTime thisOpenTime = DateUtil.offsetMinute(lastCloseTime, maxCloseMinute);
//取当前权重的开始索引作为范围结束
int endIndex = weightDuration.getOpenIndex();
SpaceOptimizeWeight spaceOptimizeWeight;
int beginIndex = 0;
int sub = 0;
for (int j = 0; j < endIndex; j++) {
spaceOptimizeWeight = weightList.get(j);
if (spaceOptimizeWeight.getTimestamp().compareTo(thisOpenTime) >= 0 && spaceOptimizeWeight.getWeight() > 0) {
//确定开始位置
if (0 == beginIndex) {
beginIndex = j;
}
sub++;
}
}
//判断时间区间是否连续(暂时不用,留着,不连续的处理很麻烦)
boolean b = endIndex - beginIndex == sub;
}
} }
} }
} }
......
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