From 814e715aae8f85e2dbe55e252644f4aca2689c74 Mon Sep 17 00:00:00 2001 From: lijw Date: Thu, 13 Mar 2025 17:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GlobalExceptionHandler.java | 2 +- .../controller/PatrolResultController.java | 38 ++++++++++++++----- .../inspect/partrolresult/domain/AlgInfo.java | 2 + .../service/impl/PatrolResultServiceImpl.java | 8 +++- .../taskinfo/mapper/PatrolTaskInfoMapper.java | 4 ++ .../impl/PatrolTaskInfoServiceImpl.java | 8 +++- .../mapper/task/PatrolResultMapper.xml | 2 +- .../mapper/task/PatrolTaskInfoMapper.xml | 16 +++++++- .../mapper/task/ResultAnalysisMapper.xml | 2 +- 9 files changed, 65 insertions(+), 17 deletions(-) diff --git a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java index e40a092..4f09379 100644 --- a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java +++ b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -@RestControllerAdvice +//@RestControllerAdvice public class GlobalExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); 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 d21fc23..b4003e2 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 @@ -1,8 +1,10 @@ package com.inspect.partrolresult.controller; +import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.inspect.analysis.domain.ResultAnalysis; +import com.inspect.analysis.domain.resultList; import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.constant.Color; import com.inspect.base.core.domain.DataMsg; @@ -567,7 +569,7 @@ public class PatrolResultController extends BaseController { sendData.setRequestHostPort(TASK_PORT); sendData.setRequestId(uuid); algName = JSONObject.toJSONString(sendData); - System.out.println(algName); + logger.info(algName); try { InfraredRequestParam infraredRequestParam = JSONObject.parseObject(algName, InfraredRequestParam.class); @@ -693,6 +695,14 @@ public class PatrolResultController extends BaseController { String BIG_ANALYSIS_URL = patrolTaskService.selectConfigByKey("BIG_ANALYSIS_URL"); 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); + String ids = ""; for (PatrolResult patrolResult : patrolResultList) { List filterList = new ArrayList<>(); @@ -705,6 +715,8 @@ public class PatrolResultController extends BaseController { Map map = patrolResultService.selectAlgorithmType(patrolResult.getDeviceId()); String[] strings = new String[1]; List algIds = new ArrayList<>(); + + logger.info("map: " + map.toString()); if (map != null) { String subIdStr = map.get("alg_subtype_ids"); if (subIdStr.contains(StringUtils.COMMA)) { @@ -728,12 +740,16 @@ public class PatrolResultController extends BaseController { if (patrolResultTemp.getAlgId() != null && !patrolResultTemp.getAlgId().isEmpty()) { algInfoList = patrolResultService.selectAlgInfo(patrolResultTemp); } + logger.info("algInfoList: " + algInfoList); reqItem.setImageUrlList(image.split(StringUtils.COMMA)); String pictureFrame = patrolTaskService.selectConfigByKey("PICTURE_FRAME"); + logger.info("pictureFrame: " + pictureFrame); + String type; if (!algInfoList.isEmpty()) { List infraredList = algInfoList.stream().filter((item) -> { + logger.info("item.getAlgSubtypeCode(): " + item.getAlgSubtypeCode()); return "infrared".equals(item.getAlgSubtypeCode()); }).collect(Collectors.toList()); String[] typeArr; @@ -778,6 +794,7 @@ public class PatrolResultController extends BaseController { } Map judgeMap = resultAnalysisService.selectPointInfoById(patrolResult.getDeviceId()); + logger.info("judgeMap: " + judgeMap.toString()); String filePanpath = ""; if (judgeMap != null && StringUtils.isNotEmpty(judgeMap.get("dis_ref_picture_path"))) { filePanpath = judgeMap.get("dis_ref_picture_path"); @@ -826,6 +843,7 @@ public class PatrolResultController extends BaseController { } } + logger.info("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); @@ -839,6 +857,7 @@ public class PatrolResultController extends BaseController { try { InfraredRequestParam infraredRequestParam = JSONObject.parseObject(type, InfraredRequestParam.class); InfraredResponse infraredResponse = infraredImageParser.parse(infraredRequestParam); + logger.info("infraredResponse:" + infraredResponse); if (infraredResponse != null) { ResultAnalysis resultAnalysis = new ResultAnalysis(); if (infraredResponse.getResultList() != null && !infraredResponse.getResultList().isEmpty()) { @@ -1113,7 +1132,7 @@ public class PatrolResultController extends BaseController { logger.info("[RES] items empty!!!"); } } catch (Exception e) { - e.printStackTrace(); + logger.error("error", e); } } else if (StaEnum.CtlModel.getCode().equals(type)) { @@ -1330,7 +1349,7 @@ public class PatrolResultController extends BaseController { Map valueMap = patrolResultService.getPatrolResultValue(arr); if (null != valueMap && !valueMap.isEmpty()) { - System.out.println("valueMap::" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit")); + logger.info("valueMap::" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit")); if (valueMap.containsKey("value") && null != valueMap.get("value")) { strfile = valueMap.get("value"); arr.setValue(strfile); @@ -1350,9 +1369,9 @@ public class PatrolResultController extends BaseController { } i = patrolResultService.updatePatrolResult(patrolResult2); - if (!"2".equals(Jqtype)) { +// if (!"2".equals(Jqtype)) { resultList.add(patrolResult2); - } +// } } else { arr.setMainId(mainID + ""); Map stringStringMap = patrolResultService.selectThresholdByPointId(arr.getDeviceId()); @@ -1384,7 +1403,7 @@ public class PatrolResultController extends BaseController { Map valueMap = patrolResultService.getPatrolResultValue(arr); if (null != valueMap && !valueMap.isEmpty()) { - System.out.println("valueMap::" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit")); + logger.info("valueMap::" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit")); if (valueMap.containsKey("value") && null != valueMap.get("value")) { strfile = valueMap.get("value"); arr.setValue(strfile); @@ -1399,13 +1418,14 @@ public class PatrolResultController extends BaseController { logger.info("[RES] mainId: {}, deviceId: {}, taskPatrolId: {} !!!!!!!!!!!!!!!!!", arr.getMainId(), arr.getDeviceId(), arr.getTaskPatrolledId()); i = patrolResultService.insertPatrolResult(arr); resultStatistics.compare(arr); - if (!"2".equals(Jqtype)) { +// if (!"2".equals(Jqtype)) { resultList.add(arr); - } +// } } } - + logger.info("------------------------Jqtype: " + Jqtype); + logger.info("------------------------resultList.isEmpty(): " + resultList.isEmpty()); if (!resultList.isEmpty()) { logger.info(Color.RED + "[RES] ++++++++++++++++++++++++++++callAlgorithm++++++++++++++++++++++++++" + Color.END); //callLocalAlgorithm(resultList); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AlgInfo.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AlgInfo.java index b207150..154050c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AlgInfo.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AlgInfo.java @@ -2,9 +2,11 @@ package com.inspect.partrolresult.domain; import lombok.Getter; import lombok.Setter; +import lombok.ToString; @Setter @Getter +@ToString public class AlgInfo { private String algSubtypeName; private String algSubtypeCode; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index 9846c36..20a87df 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -406,11 +406,15 @@ public class PatrolResultServiceImpl implements IPatrolResultService { reportData.setDataSources("0".equals(devType) ? "无人机" : "1".equals(devType) ? "机器人" : "高清视频"); reportData.setAcquisitionTime(DateUtils.parse(DateUtils.yyyyMMddHHmmss2, patrolResultRef.getTime())); reportData.setInspectionResults(patrolResultRef.getDescription()); - if (patrolResultRef.getThreshold().contains("sub_53")) { + String threshold = patrolResultRef.getThreshold(); + if(StringUtils.isBlank(threshold)) { + threshold = ""; + } + if (threshold.contains("sub_53")) { reportData.setInspectionResults(patrolResultRef.getValue()); } - if ((patrolResultRef.getThreshold().contains("sub_52") || patrolResultRef.getThreshold().contains("sub_53")) + if ((threshold.contains("sub_52") || threshold.contains("sub_53")) && !"0".equals(patrolResultRef.getValue()) && !"1".equals(patrolResultRef.getValue()) && !"-1".equals(patrolResultRef.getValue()) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java index 378e828..f933781 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java @@ -24,6 +24,10 @@ public interface PatrolTaskInfoMapper { List selectPatrolTaskInfoListByMajorId(String patrolTaskInfo); + List selectPatrolTaskInfoListByMajorIdEither(String patrolTaskInfo); + + List selectPatrolTaskInfoListByMajorIdFull(String patrolTaskInfo); + List selectPatrolAbnormalTaskList(PatrolTaskInfo patrolTaskInfo); int insertPatrolTaskInfo(PatrolTaskInfo patrolTaskInfo); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java index 72b363b..73b84d0 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java @@ -45,7 +45,13 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { } public List selectPatrolTaskInfoListByMajorId(String taskId) { - return this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorId(taskId); + List list1 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorId(taskId); + List list2 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdFull(taskId); + if(list1.size() > 0 && list1.get(0).equals(list2.get(0))) { + return this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdEither(taskId); + } else { + return list1; + } } public List selectPatrolAbnormalTaskList(PatrolTaskInfo patrolTaskInfo) { diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index f3e8671..c9d41b1 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -357,7 +357,7 @@ from basedata_patrolpoint a left join basedata_alg_subtype b on a.alg_subtype_ids = b.alg_subtype_id left join basedata_alg c on b.alg_id = c.alg_id - where a.patrol_point_id = #{lineId} + where a.patrol_point_id = #{lineId} OR a.patrol_point_code LIKE concat('%',#{lineId}) select substring_index(patrol_point_code, '|', -1) from basedata_patrolpoint - where patrol_point_id - in (select DISTINCT(device_id) from patrol_task_info where task_major_id = #{taskId}) + where patrol_point_id in (select DISTINCT(device_id) from patrol_task_info where task_major_id = #{taskId}) + + + + + select * from basedata_patrolpoint - where patrol_point_id = #{deviceId} + where patrol_point_id = #{deviceId} OR patrol_point_code LIKE concat('%',#{lineId})