文档问题处理

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

@@ -1055,14 +1055,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         if (StringUtils.isNotEmpty(gatewayId)) {
             Map<String, String> map = monitorFanIndicatorregionMapper.getMajorBoosterStationInfoBySort(gatewayId, routeName);
             Map<String, List<String>> queryCodtion = new HashMap<>();
-            Map<String, String> shoudQueryCondtion = new HashMap<>();
+            Map<String, String> likeMap = new HashMap<>();
             queryCodtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-            queryCodtion.put(CommonConstans.QueryStringSystemType, Arrays.asList("开关"));
-            shoudQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, map.get("boosterName"));
+            queryCodtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
+            likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, map.get("boosterName"));
             if ("1主变高压侧".equals(map.get("boosterName")) || "1主变低压侧".equals(map.get("boosterName"))) {
-                shoudQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, map.get("压侧"));
-                List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCodtion, shoudQueryCondtion, ESEquipments.class);
-                ;
+                likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, map.get("压侧"));
+                List<ESEquipments> listData = commonServiceImpl.getListDataByCondtionsAndLike(queryCodtion, null, ESEquipments.class, likeMap);
+
                 // 主变高压侧
                 Map<String, String> zbGYC = listData.stream().filter(t -> t.getFrontModule().contains("1主变高压侧")).collect(Collectors.toMap(ESEquipments::getDisplayName, ESEquipments::getValue));
                 List<Map<String, String>> zbList = new ArrayList<>();
@@ -1088,7 +1088,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     e.printStackTrace();
                 }
             } else {
-                List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCodtion, shoudQueryCondtion, ESEquipments.class);
+                List<ESEquipments> listData = commonServiceImpl.getListDataByCondtionsAndLike(queryCodtion, null, ESEquipments.class, likeMap);
                 ArrayList<Map<String, String>> resultList = new ArrayList<>();
                 listData.forEach(item -> {
                     HashMap<String, String> stringStringHashMap = new HashMap<>();