From d296fc7da559b3d6d73278a72088c0f78d5eb07e Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Tue, 22 Apr 2025 21:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E8=A7=86=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85,=E5=A4=A7=E6=A8=A1=E5=9E=8B=E5=88=9D=E7=AD=9B?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 48 ++++++++----------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 36d0db6..ded728f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/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 filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); logger.info("---------------[TASK] query filterList {}", filterList); List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); logger.info("----------------[TASK] query algInfos {}", algInfos); resultAnalysis.setFilter("0"); long t2 = System.currentTimeMillis(); + // 大模型数据 List newList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); logger.info("----------------[TASK] query newList {}", newList); if (newList == null) { return getDataTable(2, new ArrayList<>(), new ArrayList<>()); } - List 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 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 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 pageList = resultList.subList((pageNum - 1) * pageSize, toNum); + int toNum = Math.min(newList.size(), pageNum * pageSize); + List pageList = newList.subList((pageNum - 1) * pageSize, toNum); // int toNum = newList.size(); // List 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); }