From df48f4ce21fe85b8a0d0ef2874943d79c4b85642 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Wed, 21 Jan 2026 17:15:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 123 ++++++++++++++---- 1 file changed, 95 insertions(+), 28 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 e21d7be..af0e222 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 @@ -284,17 +284,7 @@ public class PatrolTaskController extends BaseController { } ResultAnalysis resultAnalysis = new ResultAnalysis(); resultAnalysis.setTaskPatrolId(taskStatus.getTaskPatrolledId()); - resultAnalysis.setDeviceName(patrolTaskStatus.getDeviceName()); - resultAnalysis.setPointName(patrolTaskStatus.getPointName()); - resultAnalysis.setChannelName(patrolTaskStatus.getChannelName()); - resultAnalysis.setDeviceSource(patrolTaskStatus.getDeviceSource()); - resultAnalysis.setPointStatus(patrolTaskStatus.getPointStatus()); - resultAnalysis.setAlgName(patrolTaskStatus.getAlgName()); - resultAnalysis.setFilterDesc(patrolTaskStatus.getFilterDesc()); - resultAnalysis.setDesc(patrolTaskStatus.getDesc()); - resultAnalysis.setAbnormal(patrolTaskStatus.getAbnormal()); resultAnalysis.setPosType(patrolTaskStatus.getPosType()); - resultAnalysis.setResultType(patrolTaskStatus.getResultType()); resultAnalysis.setFilter("1"); logger.info("---------------[TASK] query resultAnalysis {}", resultAnalysis); // 初筛数据 @@ -419,17 +409,60 @@ public class PatrolTaskController extends BaseController { } newList.addAll(filterList); newList.addAll(brightNewList); - if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) { + if (StringUtils.isNotEmpty(patrolTaskStatus.getAlgName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getAlgName().equals(element.getAlgName()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getFilterDesc())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getFilterDesc().equals(element.getFilterDesc()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getDeviceName().equals(element.getDeviceName()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getPointName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getPointName().equals(element.getPointName()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getChannelName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getChannelName().equals(element.getChannelName()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceSource())) { newList = newList.stream().filter((element) -> { - return resultAnalysis.getAlgName().equals(element.getAlgName()); + return patrolTaskStatus.getDeviceSource().equals(element.getDeviceSource()); }).collect(Collectors.toList()); } - if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { + if (StringUtils.isNotEmpty(patrolTaskStatus.getPointStatus())) { newList = newList.stream().filter((element) -> { - return resultAnalysis.getFilterDesc().equals(element.getFilterDesc()); + return patrolTaskStatus.getPointStatus().equals(element.getPointStatus()); }).collect(Collectors.toList()); } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getDesc())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getDesc().equals(element.getDesc()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getResultType())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getResultType().equals(element.getWarnStatus()); + }).collect(Collectors.toList()); + } + Map keyPatrolData = new LinkedHashMap<>(); for (PatrolData patrolData : newList) { keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); @@ -2533,17 +2566,7 @@ public class PatrolTaskController extends BaseController { ResultAnalysis resultAnalysis = new ResultAnalysis(); resultAnalysis.setTaskPatrolId(patro.getTaskPatrolledId()); resultAnalysis.setFilter("1"); - resultAnalysis.setAbnormal(patrolTaskStatus.getAbnormal()); resultAnalysis.setPosType(patrolTaskStatus.getPosType()); - resultAnalysis.setResultType(patrolTaskStatus.getResultType()); - resultAnalysis.setDeviceName(patrolTaskStatus.getDeviceName()); - resultAnalysis.setPointName(patrolTaskStatus.getPointName()); - resultAnalysis.setChannelName(patrolTaskStatus.getChannelName()); - resultAnalysis.setDeviceSource(patrolTaskStatus.getDeviceSource()); - resultAnalysis.setPointStatus(patrolTaskStatus.getPointStatus()); - resultAnalysis.setAlgName(patrolTaskStatus.getAlgName()); - resultAnalysis.setFilterDesc(patrolTaskStatus.getFilterDesc()); - resultAnalysis.setDesc(patrolTaskStatus.getDesc()); List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); resultAnalysis.setFilter("0"); @@ -2659,13 +2682,57 @@ public class PatrolTaskController extends BaseController { 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()); + if (StringUtils.isNotEmpty(patrolTaskStatus.getAlgName())) { + newList = newList.stream().filter((element) -> patrolTaskStatus.getAlgName().equals(element.getAlgName())).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getFilterDesc())) { + newList = newList.stream().filter((element) -> patrolTaskStatus.getFilterDesc().equals(element.getFilterDesc())).collect(Collectors.toList()); + } + + + if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getDeviceName().equals(element.getDeviceName()); + }).collect(Collectors.toList()); } - if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { - newList = newList.stream().filter((element) -> resultAnalysis.getFilterDesc().equals(element.getFilterDesc())).collect(Collectors.toList()); + if (StringUtils.isNotEmpty(patrolTaskStatus.getPointName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getPointName().equals(element.getPointName()); + }).collect(Collectors.toList()); } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getChannelName())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getChannelName().equals(element.getChannelName()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceSource())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getDeviceSource().equals(element.getDeviceSource()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getPointStatus())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getPointStatus().equals(element.getPointStatus()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getDesc())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getDesc().equals(element.getDesc()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(patrolTaskStatus.getResultType())) { + newList = newList.stream().filter((element) -> { + return patrolTaskStatus.getResultType().equals(element.getWarnStatus()); + }).collect(Collectors.toList()); + } + if ("1".equals(patrolTaskStatus.getAbnormal())) { // 异常置顶 newList.sort(Comparator.comparing(PatrolData::getPointStatus));