Commit 4ae25391 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ea739571
......@@ -173,7 +173,14 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//取井口并遍历
wellheadList = wellheadMap.get(detail.getId());
BigDecimal serviceRating = BigDecimal.ZERO;
for (SpaceInstitutionWellheadView wellhead : wellheadList) {
List<SpaceInstitutionDurationEnt> durationEntList;
SpaceInstitutionWellheadView wellhead;
for (int i = 0; i < wellheadList.size(); i++) {
wellhead = wellheadList.get(i);
durationEntList = durationMap.get(detail.getId()).get(wellhead.getWellheadId());
if (CollUtil.isEmpty(durationEntList)) {
continue;
}
serviceRating = serviceRating.add(wellhead.getServiceRating());
//计算权重
int rangeListSize = rangeToList.size();
......@@ -260,6 +267,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
weightList = weightList.stream()
.sorted(Comparator.comparing(SpaceOptimizeWeight::getSort))
.collect(Collectors.toList());
for (SpaceInstitutionDurationEnt durationEnt : durationEntList) {
}
}
}
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