From 730b4e14a0d2e3189d67b84855b2463492161d02 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Mon, 1 Sep 2025 17:11:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=BC=82=E5=B8=B8=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/task/controller/PatrolTaskController.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 985c333..03d976f 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 @@ -361,6 +361,10 @@ public class PatrolTaskController extends BaseController { keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); } newList = new ArrayList<>(keyPatrolData.values()); + if ("1".equals(patrolTaskStatus.getAbnormal())) { + // 异常置顶 + newList.sort(Comparator.comparing(PatrolData::getPointStatus)); + } PageDomain pageDomain = TableSupport.buildPageRequest(); int pageNum = pageDomain.getPageNum(); @@ -2553,6 +2557,10 @@ public class PatrolTaskController extends BaseController { if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { newList = newList.stream().filter((element) -> resultAnalysis.getFilterDesc().equals(element.getFilterDesc())).collect(Collectors.toList()); } + if ("1".equals(patrolTaskStatus.getAbnormal())) { + // 异常置顶 + newList.sort(Comparator.comparing(PatrolData::getPointStatus)); + } if (newList.size() > maxNum) { return ResponseEntity.ok("超过最大导出数量:" + maxNum + "条,请结合查询条件减少导出的数量！"); From 89746db43b20fc2e076a9f53b9a2fea7d2a1f6ec Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Mon, 1 Sep 2025 17:54:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=85=BC=E5=AE=B9=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E4=BC=A0=E8=BF=87=E6=9D=A5=E5=A4=9A=E4=B8=AAalgType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/service/impl/AnalyseResponseServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index 966dc52..c048151 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -770,6 +770,10 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { resItem.getObjectId(), patrolResult.getFilePath(), analyseResPoint); + if (StringUtils.isEmpty(resultAnalysis.getAlgType()) || resultAnalysis.getAlgType().contains(",")) { + // 兼容算法结果传过来多个算法 + continue; + } resultAnalysisList.add(resultAnalysis); valueJoiner.add(resultAnalysis.getResValue()); String pointStatus = resultAnalysis.getPointStatus();