文档问题处理

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

@@ -1822,19 +1822,19 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("运行"));
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        queryCondtion.put("value", Arrays.asList("true"));
-        Map<String, String> shouldQueryCondtion = new HashMap<>();
-        shouldQueryCondtion.put("frontModule", "逆变器");
-        List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldQueryCondtion, ESEquipments.class);
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
+        List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         // 逆变器总数量
         Integer totalNumber = result.size();
         List<String> zcEquipmentNumberList = result.stream().filter(t -> "true".equals(t.getValue())).map(ESEquipments::getEquipmentNumber).collect(Collectors.toList());
         Map<String, List<String>> queryCondtion1 = new HashMap<>();
         queryCondtion1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("待机", "故障停机", "告警运行", "限额运行", "停机", "通讯故障", "降额运行"));
         queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldQueryCondtion1 = new HashMap<>();
-        shouldQueryCondtion1.put("frontModule", "逆变器");
-        List<ESEquipments> result1 = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldQueryCondtion, ESEquipments.class);
+        queryCondtion1.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
+        Map<String, String> likeMap1 = new HashMap<>();
+        likeMap1.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
+        List<ESEquipments> result1 = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion1, null, ESEquipments.class, likeMap1);
         List<String> equipmentNumberList = result1.stream().map(ESEquipments::getEquipmentNumber).distinct().collect(Collectors.toList());
         int djNum = 0;
         int gzNum = 0;