From 1b4ee49b5eea7393d07fb1b57954148e4590edb2 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Mon, 21 Apr 2025 10:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=89=8D=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E4=BC=A0=E5=80=BC=E5=88=A4=E6=96=AD=E6=98=AF=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=88=9D=E7=AD=9B=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E5=A4=A7=E6=A8=A1=E5=9E=8B=E7=BB=93=E6=9E=9C=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultAnalysisController.java | 89 +++++++++++++------ 1 file changed, 62 insertions(+), 27 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index 9040e37..a54e96f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/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 filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); - List 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 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 filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + List 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 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 filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); + startPage(); + resultAnalysis.setResult("1");//大模型结果 + resultAnalysis.setResultType("1");//结果正常 + List 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 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"})