From fd28ff4053c4a73b7adac226c9141852213322d6 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Fri, 29 Aug 2025 14:13:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=81=B5=E5=B7=9E=E7=AB=99=E5=BD=92?= =?UTF-8?q?=E6=A1=A3=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 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 d20f8ce..6fd3ec3 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 @@ -356,6 +356,11 @@ public class PatrolTaskController extends BaseController { return resultAnalysis.getFilterDesc().equals(element.getFilterDesc()); }).collect(Collectors.toList()); } + Map keyPatrolData = new HashMap<>(); + for (PatrolData patrolData : newList) { + keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); + } + newList = new ArrayList<>(keyPatrolData.values()); PageDomain pageDomain = TableSupport.buildPageRequest(); int pageNum = pageDomain.getPageNum(); @@ -2453,7 +2458,8 @@ public class PatrolTaskController extends BaseController { if (!filterDatas.isEmpty()) { item.setImg((filterDatas.get(0)).getImgAnalyse()); item.setFilterDesc((filterDatas.get(0)).getDesc()); - filterList.remove(filterDatas.get(0)); +// filterList.remove(filterDatas.get(0)); + filterList.removeAll(filterDatas); } // 光明大模型数据 List brightDatas = brightNewList.stream().filter((bright) -> { @@ -2463,7 +2469,8 @@ public class PatrolTaskController extends BaseController { item.setBrightDesc(brightDatas.get(0).getDesc()); item.setBrightResStatus(brightDatas.get(0).getResStatus()); item.setBrightImgAnalyse(brightDatas.get(0).getImgAnalyse()); - brightNewList.remove(brightDatas.get(0)); +// brightNewList.remove(brightDatas.get(0)); + brightNewList.removeAll(brightDatas); } } @@ -2486,7 +2493,8 @@ public class PatrolTaskController extends BaseController { item.setBrightDesc(brightDatas.get(0).getDesc()); item.setBrightResStatus(brightDatas.get(0).getResStatus()); item.setBrightImgAnalyse(brightDatas.get(0).getImgAnalyse()); - brightNewList.remove(brightDatas.get(0)); +// brightNewList.remove(brightDatas.get(0)); + brightNewList.removeAll(brightDatas); } item.setAlgName( algInfos.stream().anyMatch((alg) -> { @@ -2533,6 +2541,11 @@ public class PatrolTaskController extends BaseController { } newList.addAll(filterList); newList.addAll(brightNewList); + Map keyPatrolData = new HashMap<>(); + for (PatrolData patrolData : newList) { + keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); + } + newList = new ArrayList<>(keyPatrolData.values()); if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) { newList = newList.stream().filter((element) -> resultAnalysis.getAlgName().equals(element.getAlgName())).collect(Collectors.toList()); }