fix:任务详情条件查询bug

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<String, PatrolData> 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<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         List<AlgInfo> 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));