From c772e49d0af427c5398751229af2ee53812d08c0 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Fri, 12 Sep 2025 13:50:46 +0800 Subject: [PATCH] =?UTF-8?q?/*=E7=BB=8D=E5=85=B4=E7=AB=99=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BF=87=E6=BB=A4*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/prodevmnt/controller/BasedataDeviceController.java | 1 - .../metadata/prodevmnt/util/AreaDeviceTreeSelectUtil.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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) {