Commit 854ca537 authored by duwei's avatar duwei

4个指标不需要加状态过滤

parent 6522a857
...@@ -248,8 +248,8 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService { ...@@ -248,8 +248,8 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
if (isZeros(endDate)) { if (isZeros(endDate)) {
endDate = DateUtil.offsetDay(endDate, 1); // 包含最后一天 endDate = DateUtil.offsetDay(endDate, 1); // 包含最后一天
} }
int startStamp = (int) (startDate.getTime() / 1000); // 10位时间戳 // int startStamp = (int) (startDate.getTime() / 1000); // 10位时间戳
int endStamp = (int) (endDate.getTime() / 1000); // int endStamp = (int) (endDate.getTime() / 1000);
String startTime = DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss"); String startTime = DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss"); String endTime = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
...@@ -962,25 +962,21 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService { ...@@ -962,25 +962,21 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
if (status == CrossStatusEnum.CONGESTION.getCode()) { if (status == CrossStatusEnum.CONGESTION.getCode()) {
average = subList.stream() average = subList.stream()
.filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
.mapToDouble(CrossDataHistPO::getCongestionIndex) .mapToDouble(CrossDataHistPO::getCongestionIndex)
.average() .average()
.orElse(0.0); .orElse(0.0);
} else if (status == CrossStatusEnum.UNBALANCE.getCode()) { } else if (status == CrossStatusEnum.UNBALANCE.getCode()) {
average = subList.stream() average = subList.stream()
.filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
.mapToDouble(CrossDataHistPO::getUnbalanceIndex) .mapToDouble(CrossDataHistPO::getUnbalanceIndex)
.average() .average()
.orElse(0.0); .orElse(0.0);
} else if (status == CrossStatusEnum.SPILLOVER.getCode()) { } else if (status == CrossStatusEnum.SPILLOVER.getCode()) {
average = subList.stream() average = subList.stream()
.filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
.mapToDouble(CrossDataHistPO::getSpilloverIndex) .mapToDouble(CrossDataHistPO::getSpilloverIndex)
.average() .average()
.orElse(0.0); .orElse(0.0);
}else if (status == CrossStatusEnum.EMPTY_RELEASE.getCode()) { }else if (status == CrossStatusEnum.EMPTY_RELEASE.getCode()) {
average = subList.stream() average = subList.stream()
.filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
.mapToDouble(CrossDataHistPO::getDuration) .mapToDouble(CrossDataHistPO::getDuration)
.average() .average()
.orElse(0.0); .orElse(0.0);
......
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