|
|
|
@ -651,7 +651,15 @@ public class ResultAnalysisController extends BaseController { |
|
|
|
resultAnalysis.setResultType("2"); // 2异常 |
|
|
|
resultAnalysis.setPosType(patrolTaskStatus.getPosType()); |
|
|
|
List<PatrolData> list = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); |
|
|
|
List<PatrolData> 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<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); |
|
|
|
List<PatrolData> 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<PatrolData> 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()); |
|
|
|
} |
|
|
|
|