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 dbf7892..713d39c 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 @@ -651,7 +651,15 @@ public class ResultAnalysisController extends BaseController { resultAnalysis.setResultType("2"); // 2异常 resultAnalysis.setPosType(patrolTaskStatus.getPosType()); List list = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + List filterList = new ArrayList<>(); + if ("0".equals(patrolTaskStatus.getFilter()) && list != null && list.size() > 0) { + resultAnalysis.setFilter("1"); + resultAnalysis.setResultType(""); + resultAnalysis.setPosType(""); + filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + } List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); + List finalFilterList = filterList; list.forEach((item) -> { try { item.setAlgName((algInfos.stream().filter((alg) -> { @@ -666,6 +674,17 @@ public class ResultAnalysisController extends BaseController { } } } + + if ("0".equals(item.getFilter())) { + // 初筛数据 + List filterDatas = finalFilterList.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()); + } + } } catch (Exception e) { logger.error("list_exception: algType: {}, exception: {}", item.getAlgType(), e.getMessage()); }