修改采集器参数

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

@@ -599,7 +599,7 @@ public class CommonServiceImpl {
             List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
             return list;
         }
-        return null;
+        return new ArrayList<>();
     }
 
 

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

@@ -841,18 +841,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
         queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList(frontModule));
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
+        likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule);
 
         if (stationType.equals("FDZ")) {
             queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList(systemType));
         } else {
-            likeMap.put(CommonConstans.QueryStringSystemType, systemType);
+            likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, systemType);
         }
-
-        List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
-
-
-       // List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap);
+        List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap);
         Integer traceIdCount  = indicatorsDtoList.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList()).size();
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (ESEquipments listDatum : indicatorsDtoList) {