From d1ff442f3cac0ddcea482e92e219e3a0fed55b2d Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Mon, 2 Feb 2026 10:43:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A1=E8=A7=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E8=AE=BE=E5=A4=87=E3=80=81?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=90=8D=E7=A7=B0=E3=80=81=E7=9B=B8=E6=9C=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E6=9D=A5=E6=BA=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 1ab47ed..a88c89f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -421,28 +421,29 @@ public class PatrolTaskController extends BaseController { }).collect(Collectors.toList()); } + // 生产设备 模糊匹配 if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceName())) { - newList = newList.stream().filter((element) -> { - return patrolTaskStatus.getDeviceName().equals(element.getDeviceName()); - }).collect(Collectors.toList()); + newList = newList.stream().filter((element) -> + element.getDeviceName().contains(patrolTaskStatus.getDeviceName()) + ).collect(Collectors.toList()); } - + // 点位名称 模糊匹配 if (StringUtils.isNotEmpty(patrolTaskStatus.getPointName())) { - newList = newList.stream().filter((element) -> { - return patrolTaskStatus.getPointName().equals(element.getPointName()); - }).collect(Collectors.toList()); + newList = newList.stream().filter((element) -> + element.getPointName().contains(patrolTaskStatus.getPointName()) + ).collect(Collectors.toList()); } - + // 相机名称 模糊匹配 if (StringUtils.isNotEmpty(patrolTaskStatus.getChannelName())) { - newList = newList.stream().filter((element) -> { - return patrolTaskStatus.getChannelName().equals(element.getChannelName()); - }).collect(Collectors.toList()); + newList = newList.stream().filter((element) -> + element.getChannelName().contains(patrolTaskStatus.getChannelName()) + ).collect(Collectors.toList()); } - + // 来源系统 模糊匹配 if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceSource())) { - newList = newList.stream().filter((element) -> { - return patrolTaskStatus.getDeviceSource().equals(element.getDeviceSource()); - }).collect(Collectors.toList()); + newList = newList.stream().filter((element) -> + element.getDeviceSource().contains(patrolTaskStatus.getDeviceSource()) + ).collect(Collectors.toList()); } if (StringUtils.isNotEmpty(patrolTaskStatus.getPointStatus())) {