巡视任务详情,大模型初筛合并一条数据

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

@@ -194,25 +194,21 @@ public class PatrolTaskController extends BaseController {
         resultAnalysis.setResultType(patrolTaskStatus.getResultType());
         resultAnalysis.setFilter("1");
         logger.info("---------------[TASK] query resultAnalysis {}", resultAnalysis);
+        // 初筛数据
         List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         logger.info("---------------[TASK] query filterList {}", filterList);
         List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
         logger.info("----------------[TASK] query algInfos {}", algInfos);
         resultAnalysis.setFilter("0");
         long t2 = System.currentTimeMillis();
+        // 大模型数据
         List<PatrolData> newList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         logger.info("----------------[TASK] query newList {}", newList);
         if (newList == null) {
             return getDataTable(2, new ArrayList<>(), new ArrayList<>());
         }
-        List<PatrolData> resultList = new ArrayList<>();
-        resultList.addAll(filterList);
-        resultList.addAll(newList);
-        if (resultList == null || resultList.size() == 0) {
-            return getDataTable(2, new ArrayList<>(), new ArrayList<>());
-        }
         long t3 = System.currentTimeMillis();
-        for (PatrolData item : resultList) {
+        for (PatrolData item : newList) {
 //            item.setAlgName((algInfos.stream().filter((alg) -> {
 //                return alg.getAlgSubtypeCode().equals(item.getAlgType());
 //            }).findFirst().get()).getAlgSubtypeName());
@@ -224,22 +220,16 @@ public class PatrolTaskController extends BaseController {
                 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(item.getAlgType());
-//                }).collect(Collectors.toList());
-//                if (!filterDatas.isEmpty()) {
-//                    item.setImg((filterDatas.get(0)).getImgAnalyse());
-//                    item.setFilterDesc((filterDatas.get(0)).getDesc());
-//                } else {
-//                    item.setImg("");
-//                }
-//            } else {
-//                item.setImg(item.getImgAnalyse());
-//                item.setImgAnalyse("");
-//                item.setFilterDesc(item.getDesc());
-//                item.setDesc("");
-//            }
+            if ("0".equals(item.getFilter())) {
+                List<PatrolData> filterDatas = filterList.stream().filter((data) -> {
+                    return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(item.getAlgType());
+                }).collect(Collectors.toList());
+                if (!filterDatas.isEmpty()) {
+                    item.setImg((filterDatas.get(0)).getImgAnalyse());
+                    item.setFilterDesc((filterDatas.get(0)).getDesc());
+                    filterList.remove(filterDatas.get(0));
+                }
+            }
 
             AlgValue algValue = new AlgValue();
             if(item.getResValue() != null) {
@@ -252,15 +242,15 @@ public class PatrolTaskController extends BaseController {
             }
 
         }
-
+        newList.addAll(filterList);
         if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) {
-            resultList = resultList.stream().filter((element) -> {
+            newList = newList.stream().filter((element) -> {
                 return element.getAlgName().equals(resultAnalysis.getAlgName());
             }).collect(Collectors.toList());
         }
 
         if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) {
-            resultList = resultList.stream().filter((element) -> {
+            newList = newList.stream().filter((element) -> {
                 return element.getFilterDesc().equals(resultAnalysis.getFilterDesc());
             }).collect(Collectors.toList());
         }
@@ -268,15 +258,15 @@ public class PatrolTaskController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         int pageNum = pageDomain.getPageNum();
         int pageSize = pageDomain.getPageSize();
-        int toNum = Math.min(resultList.size(), pageNum * pageSize);
-        List<PatrolData> pageList = resultList.subList((pageNum - 1) * pageSize, toNum);
+        int toNum = Math.min(newList.size(), pageNum * pageSize);
+        List<PatrolData> pageList = newList.subList((pageNum - 1) * pageSize, toNum);
 //        int toNum = newList.size();
 //        List<PatrolData> pageList = newList.subList(0, toNum);
         long t5 = System.currentTimeMillis();
         logger.info("[MAIN TASK] task detail inquery step 1 cost: {}", (t2 - t1));
         logger.info("[MAIN TASK] task detail inquery step 2 cost: {}", (t3 - t2));
         logger.info("[MAIN TASK] task detail inquery step 3 cost: {}", (t5 - t3));
-        return getDataTable(0, pageList, resultList);
+        return getDataTable(0, pageList, newList);
     }