巡视任务详情条件查询信息修改

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -2591,7 +2591,7 @@ public class PatrolTaskController extends BaseController {
         PatrolTaskStatus patro = patrolTaskStatusService.selectPatrolTaskStatusByLineId(patrolTaskStatus.getLineId());
         ResultAnalysis resultAnalysis = new ResultAnalysis();
         resultAnalysis.setTaskPatrolId(patro.getTaskPatrolledId());
-        resultAnalysis.setResult("0");
+        resultAnalysis.setFilter("1");
         resultAnalysis.setDeviceName(patrolTaskStatus.getDeviceName());
         resultAnalysis.setPointName(patrolTaskStatus.getPointName());
         resultAnalysis.setChannelName(patrolTaskStatus.getChannelName());
@@ -2604,7 +2604,7 @@ public class PatrolTaskController extends BaseController {
         resultAnalysis.setPosType(patrolTaskStatus.getPosType());
         resultAnalysis.setResultType(patrolTaskStatus.getResultType());
         List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
-        resultAnalysis.setResult("1");
+        resultAnalysis.setFilter("0");
         List<PatrolData> newList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
         Map<String, Object> map = new HashMap<>();
@@ -2629,16 +2629,67 @@ public class PatrolTaskController extends BaseController {
                 if (!filterDatas.isEmpty()) {
                     item.setImg(filterDatas.get(0).getImgAnalyse());
                     item.setFilterDesc(filterDatas.get(0).getDesc());
-                } else {
-                    item.setImg("");
+                    filterList.remove(filterDatas.get(0));
                 }
-            } else {
-                item.setImg(item.getImgAnalyse());
-                item.setImgAnalyse("");
-                item.setFilterDesc(item.getDesc());
-                item.setDesc("");
+//                else {
+//                    item.setImg("");
+//                }
+//            } else {
+//                item.setImg(item.getImgAnalyse());
+//                item.setImgAnalyse("");
+//                item.setFilterDesc(item.getDesc());
+//                item.setDesc("");
+            }
+
+            if (!listPointName.contains(item.getPointName())) {
+                listPointName.add(item.getPointName());
+            }
+
+            Map<String, String> map1 = new HashMap<>();
+            if (!listPointStatus.contains(item.getPointStatus())) {
+                if (item.getPointStatus().equals("1")) {
+                    map1.put("value", "1");
+                    map1.put("label", "正常");
+                }
+
+                if (item.getPointStatus().equals("0")) {
+                    map1.put("value", "0");
+                    map1.put("label", "异常");
+                }
+
+                listPointStatus.add(item.getPointStatus());
+                mapList.add(map1);
             }
 
+            if (!listDeviceSource.contains(item.getDeviceSource())) {
+                listDeviceSource.add(item.getDeviceSource());
+            }
+            if (!listChannelName.contains(item.getChannelName())) {
+                listChannelName.add(item.getChannelName());
+            }
+
+            if (!listDeviceName.contains(item.getDeviceName())) {
+                listDeviceName.add(item.getDeviceName());
+            }
+
+            if (!listDesc.contains(item.getDesc()) && StringUtils.isNotEmpty(item.getDesc())) {
+                listDesc.add(item.getDesc());
+            }
+
+            if (!listFilterDesc.contains(item.getFilterDesc()) && !"".equals(item.getFilterDesc())) {
+                listFilterDesc.add(item.getFilterDesc());
+            }
+
+            if (!listAlgName.contains(item.getAlgName())) {
+                listAlgName.add(item.getAlgName());
+            }
+        }
+
+        for (PatrolData item : filterList) {
+            item.setAlgName(algInfos.stream().filter(
+                    (alg) -> alg.getAlgSubtypeCode().equals(item.getAlgType())).findFirst().get().getAlgSubtypeName()
+            );
+
             if (!listPointName.contains(item.getPointName())) {
                 listPointName.add(item.getPointName());
             }