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);