优化返回逻辑,过滤掉错误垃圾数据

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -828,6 +828,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         }
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap);
         Integer traceIdCount  = indicatorsDtoList.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList()).size();
+        if(traceIdCount>0){
+            indicatorsDtoList= indicatorsDtoList.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList());
+        }
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (ESEquipments listDatum : indicatorsDtoList) {
             Map<String, Object> statusMap = new HashMap<>();
@@ -876,6 +879,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getDisplayName().equals("")).collect(Collectors.toList());
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         Integer traceIdCount  = listData.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList()).size();
+        if(traceIdCount>0){
+            listData= listData.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList());
+        }
         for (ESEquipments listDatum : listData) {
             Map<String, Object> statusMap = new HashMap<>();
             statusMap.put("traceId",listDatum.getTraceId());