fix:灵州站归档数据不一致问题处理

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<String, PatrolData> 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<PatrolData> 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<String, PatrolData> 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());
         }