空放加过滤条件

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/RunningEvaluateServiceImpl.java

@@ -319,6 +319,7 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
 
         //5. 整合数据（按状态、时间区间重叠合并，并计算持续时间）
         runningEvaluateStatusVO.setProblemStatusList(buildProblemStatusList(filteredList));
+
         //1天时间每5分钟一个时间点列表 ["00:15", "00:30" ... ]
         List<String> minuteSectionArray = TimeArrayUtil.getMinuteSectionArray(5);
         if (!"00:00:00".equals(checktime)) {
@@ -946,21 +947,25 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
 
         if (status == CrossStatusEnum.CONGESTION.getCode()) {
             average = subList.stream()
+                    .filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
                     .mapToDouble(CrossDataHistPO::getCongestionIndex)
                     .average()
                     .orElse(0.0);
         } else if (status == CrossStatusEnum.UNBALANCE.getCode()) {
             average = subList.stream()
+                    .filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
                     .mapToDouble(CrossDataHistPO::getUnbalanceIndex)
                     .average()
                     .orElse(0.0);
         } else if (status == CrossStatusEnum.SPILLOVER.getCode()) {
             average = subList.stream()
+                    .filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
                     .mapToDouble(CrossDataHistPO::getSpilloverIndex)
                     .average()
                     .orElse(0.0);
         }else if (status == CrossStatusEnum.EMPTY_RELEASE.getCode()) {
             average = subList.stream()
+                    .filter(crossDataHistPO -> crossDataHistPO.getStatus() ==status)
                     .mapToDouble(CrossDataHistPO::getDuration)
                     .average()
                     .orElse(0.0);