根据前端的传值判断是返回初筛结果列表还是大模型结果列表

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java

@@ -517,35 +517,70 @@ public class ResultAnalysisController extends BaseController {
     @GetMapping({"/list_v2"})
     public TableDataInfo listV2(PatrolTaskStatus patrolTaskStatus) {
         logger.info("[RES ANALYZE] listV2 param: {}", patrolTaskStatus);
-        ResultAnalysis resultAnalysis = new ResultAnalysis();
-        resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId());
-        resultAnalysis.setResult("0");//初筛结果
-        startPage();
-        List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
-        List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
-        filterList.forEach((item) -> {
-            item.setAlgName((algInfos.stream().anyMatch((alg) -> {
-                return alg.getAlgSubtypeCode().equals(item.getAlgType());
-            }) ? algInfos.stream().filter((alg) -> {
-                return alg.getAlgSubtypeCode().equals(item.getAlgType());
-            }).findFirst().get().getAlgSubtypeName() : ""));
-            if("0".equals(item.getFilter())) {
-                List<PatrolData> filterDatas = filterList.stream().filter((data) -> {
-                    return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType());
-                }).collect(Collectors.toList());
-                if(!filterDatas.isEmpty()) {
-                    item.setImg((filterDatas.get(0)).getImgAnalyse());
+        if("1".equals(patrolTaskStatus.getFilter())) {
+            ResultAnalysis resultAnalysis = new ResultAnalysis();
+            resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId());
+            resultAnalysis.setResult("0");//初筛结果
+            startPage();
+            List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
+            List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
+            filterList.forEach((item) -> {
+                item.setAlgName((algInfos.stream().anyMatch((alg) -> {
+                    return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                }) ? algInfos.stream().filter((alg) -> {
+                    return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                }).findFirst().get().getAlgSubtypeName() : ""));
+                if ("0".equals(item.getFilter())) {
+                    List<PatrolData> filterDatas = filterList.stream().filter((data) -> {
+                        return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType());
+                    }).collect(Collectors.toList());
+                    if (!filterDatas.isEmpty()) {
+                        item.setImg((filterDatas.get(0)).getImgAnalyse());
+                    } else {
+                        item.setImg("");
+                    }
                 } else {
-                    item.setImg("");
+                    item.setImg(item.getImgAnalyse());
+                    item.setImgAnalyse("");
                 }
-            } else {
-                item.setImg(item.getImgAnalyse());
-                item.setImgAnalyse("");
-            }
-        });
-//        logger.info("[RES ANALYZE] filterList: {}", JSONObject.toJSONString(filterList, true));
-        Collections.sort(filterList);
-        return getDataTable(filterList);
+            });
+            //        logger.info("[RES ANALYZE] filterList: {}", JSONObject.toJSONString(filterList, true));
+            Collections.sort(filterList);
+            return getDataTable(filterList);
+        } else {
+            ResultAnalysis resultAnalysis = new ResultAnalysis();
+            resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId());
+            resultAnalysis.setResult("0");
+            List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
+            List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
+            startPage();
+            resultAnalysis.setResult("1");//大模型结果
+            resultAnalysis.setResultType("1");//结果正常
+            List<PatrolData> dataList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
+            dataList.forEach((item) -> {
+                item.setAlgName((algInfos.stream().anyMatch((alg) -> {
+                    return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                }) ? algInfos.stream().filter((alg) -> {
+                    return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                }).findFirst().get().getAlgSubtypeName() : ""));
+                if("0".equals(item.getFilter())) {
+                    List<PatrolData> filterDatas = filterList.stream().filter((data) -> {
+                        return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType());
+                    }).collect(Collectors.toList());
+                    if(!filterDatas.isEmpty()) {
+                        item.setImg((filterDatas.get(0)).getImgAnalyse());
+                    } else {
+                        item.setImg("");
+                    }
+                } else {
+                    item.setImg(item.getImgAnalyse());
+                    item.setImgAnalyse("");
+                }
+
+            });
+            Collections.sort(dataList);
+            return getDataTable(dataList);
+        }
     }
 
     @GetMapping({"summary/points"})