Commit 2e1d11f8 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d4144a5f
......@@ -192,6 +192,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
SpaceOptimizeWeight firstWeight = new SpaceOptimizeWeight();
DateTime firstTime = rangeToList.get(rangeIndex);
firstWeight.setTimestamp(firstTime);
firstWeight.setSort(rangeIndex);
firstPower = powerList.get(powerIndex);
if (0 == firstTime.compareTo(firstPower.getCreateTime())) {
firstWeight.setPower(firstPower.getPower());
......@@ -228,6 +229,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
SpaceOptimizeWeight lastWeight = new SpaceOptimizeWeight();
DateTime lastTime = rangeToList.get(rangeListSize);
lastWeight.setTimestamp(lastTime);
lastWeight.setSort(rangeListSize);
lastPower = powerList.get(powerListSize - 1);
if (0 == lastTime.compareTo(lastPower.getCreateTime())) {
lastWeight.setPower(lastPower.getPower());
......@@ -254,6 +256,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
}
weightList.add(lastWeight);
}
//排序
weightList = weightList.stream()
.sorted(Comparator.comparing(SpaceOptimizeWeight::getSort))
.collect(Collectors.toList());
}
}
return XServiceResult.OK;
......
......@@ -35,6 +35,11 @@ public class SpaceOptimizeWeight {
*/
private int weight = 0;
/**
* 排序
*/
private int sort;
/**
* 发电量
*/
......
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