diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java index ea89297..f6bc659 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java @@ -146,7 +146,9 @@ public class AnalysisServiceImpl implements IAnalysisService { } List resContentList = analyseResult.getResultList(); + Map resMap = selectObj2PatrolResultMap(analyseResult.getTaskPatrolId()); log.info(Color.GREEN + "doAlgorithmAnalysis meter algorithm resContentList: {}" + Color.END, resContentList); + log.info(Color.GREEN + "doAlgorithmAnalysis meter algorithm resMap: {}" + Color.END, JSONObject.toJSONString(resMap)); if (!resContentList.isEmpty()) { List websocketDataArrayList = new ArrayList<>(); for (AnalyseResItem algorithmResult : resContentList) { @@ -214,7 +216,13 @@ public class AnalysisServiceImpl implements IAnalysisService { resultAnalysis.setResConf(algorithmInnerResult.getConf()); resultAnalysis.setResDesc(algorithmInnerResult.getDesc()); resultAnalysis.setResult(analyseResult.getResult()); - resultAnalysis.setResImgUrl(algorithmInnerResult.getResImageUrl()); + if (StringUtils.isEmpty(algorithmInnerResult.getResImageUrl())) { + PatrolResult patrolResult = resMap.get(algorithmResult.getObjectId()); + log.info(Color.GREEN + "------------------------doAlgorithmAnalysis patrolResult: {}" + Color.END, JSONObject.toJSONString(patrolResult)); + resultAnalysis.setResImgUrl(patrolResult.getFilePath()); + } else { + resultAnalysis.setResImgUrl(algorithmInnerResult.getResImageUrl()); + } resultAnalysis.setImageNormalUrlPath(algorithmInnerResult.getImageNormalUrlPath()); resultAnalysis.setResPos(algorithmInnerResult.getPos() == null ? StringUtils.EMPTY : JSONObject.toJSONString(algorithmInnerResult.getPos())); resultAnalysis.setFilter(analyseResult.getFilter()); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index 434bffa..d7cff19 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -71,22 +71,34 @@ select line_id, - objectId, - description, - create_time, - request_id, - result_type, - point_status, - suggestion, - business_id, - res_status, - result_content + objectId, + description, + create_time, + request_id, + result_type, + point_status, + suggestion, + business_id, + res_status, + result_content, + res_value, + alg_type, + filter, + task_patrol_id, + res_code, + res_img_url, + res_conf, + res_desc, + res_pos, + result, + image_normal_url_path from result_analysis