diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java index df4ecc6..f02d567 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java @@ -190,7 +190,6 @@ public class BasedataDeviceController extends BaseController { filterNameList = new ArrayList<>(); filterNameList.add("无人机"); filterNameList.add("机器人"); - filterNameList.add("机器狗"); filterNameList.add("安防摄像头"); filterNameList.add("生活区域"); filterNameList.add("新增相机"); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/util/AreaDeviceTreeSelectUtil.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/util/AreaDeviceTreeSelectUtil.java index f85fc8e..699e0a0 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/util/AreaDeviceTreeSelectUtil.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/util/AreaDeviceTreeSelectUtil.java @@ -90,7 +90,7 @@ public class AreaDeviceTreeSelectUtil { // Helper method to determine if an area should be filtered out private static boolean shouldFilter(AreaDeviceTreeSelect area, List filterNames) { - return filterNames.stream().anyMatch(filterName -> StringUtils.isNotEmpty(area.getAreaName()) && area.getAreaName().contains(filterName)); + return filterNames.stream().anyMatch(filterName -> StringUtils.isNotEmpty(area.getAreaName()) && area.getAreaName().equals(filterName)); } private static void recursionFn(List list, AreaDeviceTreeSelect t) {