From e0094f0f6659acbe2882c631a094f5beb32e30fb Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 31 Jul 2025 09:46:19 +0800 Subject: [PATCH] =?UTF-8?q?/*=201.=20ivs=20=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E9=A2=84=E7=BD=AE=E4=BD=8DURI=5FPTZ=5FCONTROL=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=AE=8C=E5=96=84=EF=BC=9B=202.=20=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=88=B0=E5=A4=A7=E6=A8=A1=E5=9E=8B=E4=BE=A7?= =?UTF-8?q?=EF=BC=9A=E5=88=A0=E9=99=A4redis=E7=9A=84ANALYSE=5FREQUEST=5FAL?= =?UTF-8?q?G=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E9=94=AE=E5=80=BC=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ivs/controller/IvsDeviceController.java | 8 ++++---- .../exec/controller/PatrolTaskExecController.java | 9 +++++++++ .../AlgorithmRequestRetryableConsumerManager.java | 2 -- .../service/AnalyseRemoteService.java | 15 ++++++++------- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java index fdd4c0d..fd6cf8c 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java @@ -344,12 +344,12 @@ public class IvsDeviceController { ivsDevChanSnapVo.setUUID(uuid); ivsSnapshotView = ivsResourceRetryableDelegate.getSnapshotRetryable(ivsDevChanSnapVo); } catch (IOException e) { - log.info("ivsSnapshotView {}", e.getMessage() + " final fail"); + log.info("URI_PLATFORM_SNAPSHOT FINAL FAIL Msg: {}", e.getMessage()); return ResponseEntity.ok().body(new InputStreamResource(ivsResourceRetryableDelegate.generateErrorImage())); } if(ivsSnapshotView == null) { - log.info("ivsSnapshotView from recover!!!"); + log.info("URI_PLATFORM_SNAPSHOT FROM RECOVER!!!"); return ResponseEntity.ok().body(new InputStreamResource(ivsResourceRetryableDelegate.generateErrorImage())); } @@ -372,12 +372,12 @@ public class IvsDeviceController { ivsChanSnapVo.setPassword(ivsDevChanSnapVo.getPassword()); snapShotView = ivsResourceRetryableDelegate.getSnapshotListRetryable(ivsChanSnapVo); } catch (IOException e) { - log.info("snapShotView {}", e.getMessage() + " final fail"); + log.info("URI_SNAPSHOT_LIST FINAL FAIL Msg: {}", e.getMessage()); return ResponseEntity.ok().body(new InputStreamResource(ivsResourceRetryableDelegate.generateErrorImage())); } if(snapShotView == null) { - log.info("snapShotView from recover!!!"); + log.info("URI_SNAPSHOT_LIST FROM RECOVER!!!"); return ResponseEntity.ok().body(new InputStreamResource(ivsResourceRetryableDelegate.generateErrorImage())); } diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java index cfe0dc5..720d4f8 100644 --- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java +++ b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java @@ -610,6 +610,15 @@ public class PatrolTaskExecController extends BaseController { devNoList.add(devNos[i]); } } + + if(devNoList.isEmpty()) { + log.info(Color.MAGENTA + "PARSE_TASK NON-VL TASK taskCode: {}, devType: {}, devNo: {}" + Color.END, + task.getTaskCode(), + task.getDevType(), + task.getDevNo()); + return; + } + String key = RedisConst.TASK_CODE + task.getTaskCode() + StringUtils.AT + DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getFixedStartTime()); String taskPatrolledId = devNoList.get(0) + "_" + task.getTaskCode() + "_" + DateUtils.format(DateUtils.yyyyMMddHHmmss, task.getFixedStartTime()); log.debug(Color.GREEN + "[TASK] TYPE: {}, DETACH PATROLLED ID: {}" + Color.END, taskType, taskPatrolledId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestRetryableConsumerManager.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestRetryableConsumerManager.java index 2d9f2b5..eac4608 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestRetryableConsumerManager.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestRetryableConsumerManager.java @@ -6,8 +6,6 @@ import com.inspect.base.redis.service.RedisService; import com.inspect.partrolresult.domain.AnalyseRequest; import com.inspect.partrolresult.service.AnalyseRemoteService; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java index a29591b..af53ccb 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java @@ -56,7 +56,7 @@ public class AnalyseRemoteService { analyseReq.setRequestId(requestId); String taskSetKey = AnalyseConstants.ANALYSE_TASK_REQUEST + taskPatrolId; - String requestSetKey = AnalyseConstants.ANALYSE_REQUEST_ALG + requestId; + //String requestSetKey = AnalyseConstants.ANALYSE_REQUEST_ALG + requestId; redisService.setCacheObject(AnalyseConstants.ANALYSE_REQUEST_ID.concat(requestId), taskPatrolId, requestTimeout, TimeUnit.DAYS); redisService.redisTemplate.opsForSet().add(taskSetKey, requestId); @@ -83,12 +83,13 @@ public class AnalyseRemoteService { analyseReq.setObjectList(Collections.singletonList(analyseReqItem)); requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL); } else { - analyseReq.getObjectList().forEach((item) -> { - String[] itemTypeList = item.getTypeList(); - for (String type : itemTypeList) { - redisService.redisTemplate.opsForSet().add(requestSetKey, item.toResultValue(type)); - } - }); + // 不再使用这个redis键值 +// analyseReq.getObjectList().forEach((item) -> { +// String[] itemTypeList = item.getTypeList(); +// for (String type : itemTypeList) { +// redisService.redisTemplate.opsForSet().add(requestSetKey, item.toResultValue(type)); +// } +// }); if(checkInfraredType(typeList)) { requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL_INFRARED);