diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsRecordController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsRecordController.java index d221c10..a03af01 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsRecordController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsRecordController.java @@ -42,21 +42,21 @@ public class IvsRecordController { @GetMapping({"start"}) public Response start(String streamid) { - log.debug("START_RECORD record start streamId:{}", streamid); + log.info("START_RECORD record start streamId:{}", streamid); String code = redisService.getCacheObject(String.format(IvsConst.IVS_STREAM_ID, streamid)); - log.debug("START_RECORD record start code:{}", code); + log.info("START_RECORD record start code:{}", code); IvsRecStartVo ivsRecStartVo = new IvsRecStartVo(); ivsRecStartVo.setCode(code); String key = String.format(IvsConst.IVS_RECORD_START_TIME, streamid); redisService.setCacheObject(key, DateUtils.dateTimeNow(), IvsConst.IVS_RECORD_START_TIME_EXPIRE, TimeUnit.MINUTES); ivsCommonService.get(getLabel(), UriUtils.parse(IvsConst.URI_START_RECORD, ivsRecStartVo)); - log.debug("START_RECORD record start end"); + log.info("START_RECORD record start end"); return Response.ok(); } @GetMapping({"stop"}) public IvsRecStopView stop(String streamid) { - log.debug("STOP_RECORD record stop streamid:{}", streamid); + log.info("STOP_RECORD record stop streamid:{}", streamid); String key = String.format(IvsConst.IVS_STREAM_ID, streamid); String code = redisService.getCacheObject(key); IvsVo ivsRecordStartVo = new IvsVo(); @@ -79,7 +79,7 @@ public class IvsRecordController { key = String.format(IvsConst.IVS_DOWNLOAD_STREAM_ID, streamid); redisService.setCacheObject(key, ivsRecStopView.toJSON(), IvsConst.IVS_STREAM_ID_EXPIRE, TimeUnit.HOURS); - log.debug("STOP_RECORD record stop end streamid:{}", streamid); + log.info("STOP_RECORD record stop end streamid:{}", streamid); return ivsRecStopView; } diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index 2ef7b59..2887c99 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -2019,11 +2019,23 @@ public class JobMainTask { private synchronized void extractRedisTask(String redisKey, String taskCode) { List patrolTaskList = JSON.parseArray(redisService.getCacheObject(redisKey), PatrolTask.class); - if (patrolTaskList != null && !patrolTaskList.isEmpty()) { - log.info(Color.YELLOW + "[JOB] ADD NEW TASK: {}, TASK LIST SIZE: {}" + Color.END, redisKey, patrolTaskList.size()); + // 筛选出可见光任务 + List patrolTaskListEx = new ArrayList<>(); + for (PatrolTask patrolTask : patrolTaskList) { + if("2".equals(patrolTask.getDevType())) { + patrolTaskListEx.add(patrolTask); + } + } + if (!patrolTaskListEx.isEmpty()) { + log.info(Color.YELLOW + "PATROL_TASK_LIST_VL: {}, task list size: {}" + Color.END, redisKey, patrolTaskListEx.size()); redisService.setCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, taskCode, redisKey, 5L, TimeUnit.MINUTES); - execEveryDayTask(patrolTaskList); + execEveryDayTask(patrolTaskListEx); } +// if (patrolTaskList != null && !patrolTaskList.isEmpty()) { +// log.info(Color.YELLOW + "[JOB] ADD NEW TASK: {}, TASK LIST SIZE: {}" + Color.END, redisKey, patrolTaskList.size()); +// redisService.setCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, taskCode, redisKey, 5L, TimeUnit.MINUTES); +// execEveryDayTask(patrolTaskList); +// } } Map taskInfos = new HashMap<>();