diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 28ec029..b86157d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -691,12 +691,12 @@ public class PatrolResultController extends BaseController { String MAJOR_URL = patrolTaskService.selectConfigByKey("MAJOR_URL"); String TASK_PORT = patrolTaskService.selectConfigByKey("TASK_PORT"); - logger.info("ftp: " + ftp); - logger.info("ANALYSIS_URL: {}", ANALYSIS_URL); - logger.info("BIG_ANALYSIS_URL: {}", BIG_ANALYSIS_URL); - logger.info("MAJOR_URL: {}", MAJOR_URL); - logger.info("TASK_PORT: {}", TASK_PORT); - logger.info("patrolResultList: " + patrolResultList); + logger.info("callRemoteAlgorithm ftpInfo: " + ftp); + logger.info("callRemoteAlgorithm ANALYSIS_URL: " + ANALYSIS_URL); + logger.info("callRemoteAlgorithm BIG_ANALYSIS_URL: " + BIG_ANALYSIS_URL); + logger.info("callRemoteAlgorithm MAJOR_URL: " + MAJOR_URL); + logger.info("callRemoteAlgorithm TASK_PORT: " + TASK_PORT); + logger.info("callRemoteAlgorithm patrolResultList: " + patrolResultList); String ids = ""; for (PatrolResult patrolResult : patrolResultList) { @@ -711,7 +711,7 @@ public class PatrolResultController extends BaseController { String[] strings = new String[1]; List algIds = new ArrayList<>(); - logger.info("map: " + map); + logger.info("callRemoteAlgorithm algorithmTypeMap: " + map); if (map != null) { String subIdStr = map.get("alg_subtype_ids"); if (subIdStr.contains(StringUtils.COMMA)) { @@ -735,16 +735,16 @@ public class PatrolResultController extends BaseController { if (patrolResultTemp.getAlgId() != null && !patrolResultTemp.getAlgId().isEmpty()) { algInfoList = patrolResultService.selectAlgInfo(patrolResultTemp); } - logger.info("algInfoList: " + algInfoList); + logger.info("callRemoteAlgorithm algInfoList start: " + algInfoList); reqItem.setImageUrlList(image.split(StringUtils.COMMA)); String pictureFrame = patrolTaskService.selectConfigByKey("PICTURE_FRAME"); - logger.info("pictureFrame: " + pictureFrame); + logger.info("callRemoteAlgorithm pictureFrame: " + pictureFrame); String type; if (!algInfoList.isEmpty()) { List infraredList = algInfoList.stream().filter((item) -> { - logger.info("item.getAlgSubtypeCode(): " + item.getAlgSubtypeCode()); + logger.info("callRemoteAlgorithm item.getAlgSubtypeCode(): " + item.getAlgSubtypeCode()); return "infrared".equals(item.getAlgSubtypeCode()); }).collect(Collectors.toList()); String[] typeArr; @@ -789,7 +789,7 @@ public class PatrolResultController extends BaseController { } Map judgeMap = resultAnalysisService.selectPointInfoById(patrolResult.getDeviceId()); - logger.info("judgeMap: " + judgeMap.toString()); + logger.info("callRemoteAlgorithm judgeMap: " + judgeMap.toString()); String filePanpath = ""; if (judgeMap != null && StringUtils.isNotEmpty(judgeMap.get("dis_ref_picture_path"))) { filePanpath = judgeMap.get("dis_ref_picture_path"); @@ -838,7 +838,7 @@ public class PatrolResultController extends BaseController { } } - logger.info("firList.isEmpty():" + firList.isEmpty()); + logger.info("callRemoteAlgorithm firList.isEmpty(): " + firList.isEmpty()); if (!firList.isEmpty() && "true".equals(pictureFrame)) { String uuid = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); redisService.setCacheObject(uuid, patrolResultList.get(0).getTaskPatrolledId(), 1L, TimeUnit.DAYS); @@ -850,9 +850,10 @@ public class PatrolResultController extends BaseController { type = JSONObject.toJSONString(sendData); try { + logger.info("callRemoteAlgorithm infraredRequest: " + type); InfraredRequestParam infraredRequestParam = JSONObject.parseObject(type, InfraredRequestParam.class); InfraredResponse infraredResponse = infraredImageParser.parse(infraredRequestParam); - logger.info("infraredResponse:" + infraredResponse); + logger.info("callRemoteAlgorithm infraredResponse: " + infraredResponse); if (infraredResponse != null) { ResultAnalysis resultAnalysis = new ResultAnalysis(); if (infraredResponse.getResultList() != null && !infraredResponse.getResultList().isEmpty()) { @@ -906,6 +907,10 @@ public class PatrolResultController extends BaseController { } } + logger.info("callRemoteAlgorithm algInfoList end: " + algInfoList); + logger.info("callRemoteAlgorithm filterList: " + filterList); + logger.info("callRemoteAlgorithm bigList: " + bigList); + AnalyseRequest analyseReq; if (!filterList.isEmpty()) { analyseReq = new AnalyseRequest();