From ca2630d83b0c9c5da095c2a2ceb116a1d09b9d94 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Fri, 19 Sep 2025 14:37:05 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BA=91=E6=B7=B1=E5=A4=84=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E7=8B=97=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84=E4=B8=80=E4=B8=AA=E6=80=AA?= =?UTF-8?q?=E5=BC=82=E7=9A=84=E9=97=AE=E9=A2=98:=2018:22=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BA=91=E6=B7=B1=E5=A4=84=E6=9C=BA=E5=99=A8=E7=8B=97=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=BE=E7=BD=AE=E5=AE=9A=E6=97=B6=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA18:26=EF=BC=8C=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E4=BA=86101=E7=BB=99=E7=8B=97=EF=BC=8C=E6=81=B0=E5=A5=BD?= =?UTF-8?q?=E7=8B=97=E7=9A=84=E7=B3=BB=E7=BB=9F=E6=AF=94=E6=99=BA=E5=B7=A1?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A94=E5=88=86=E9=92=9F=EF=BC=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=97=B6=E9=97=B4=E5=88=B0=E4=BA=86=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E7=8B=97=E5=B0=B1=E5=BC=80=E5=A7=8B=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=8B=97=E4=B8=8A=E6=8A=A5=E4=BA=86?= =?UTF-8?q?=2041=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E4=B8=AD=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E7=BB=99=E6=99=BA=E5=B7=A1=EF=BC=8C=E6=99=BA=E5=B7=A1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=87=BA=E7=8E=B0=E8=BF=99=E6=9D=A1=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E8=87=B3=E6=AD=A4=E4=B8=80=E5=88=87=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E3=80=82=E6=B2=A1=E6=83=B3=E5=88=B0=E5=9C=A84?= =?UTF-8?q?=E5=88=86=E9=92=9F=E4=BB=A5=E5=90=8E=EF=BC=8C=E6=99=BA=E5=B7=A1?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=88=B0=E4=BA=8618:26=E5=88=86?= =?UTF-8?q?=EF=BC=8C=E4=B9=9F=E6=89=A7=E8=A1=8C=E4=BA=86=E9=82=A3=E4=B8=AA?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BB=8F=E8=BF=87?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97=E5=8F=91=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=20=E4=BA=91=E6=B7=B1=E5=A4=84=E6=9C=BA=E5=99=A8=E7=8B=97?= =?UTF-8?q?=E5=9C=A8patrol=5Ftask=5Finfo=E4=B8=AD=E6=9C=89=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=82=B9=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E7=8B=97=E4=BB=BB=E5=8A=A1=E5=BD=93=E6=88=90?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=E5=85=89=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AFpatrol=5Ftask=5Finfo?= =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=AF=B9=E5=BA=94=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E7=9A=84cameraCode=E6=98=A0=E5=B0=84=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E6=AD=A4=20=E6=8A=93=E5=88=B0=E7=9A=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=9D=87=E5=A4=B1=E8=B4=A5=E3=80=82=E9=92=88=E5=AF=B9=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E9=97=AE=E9=A2=98=E8=BF=9B=E8=A1=8C=E6=89=93=E8=A1=A5?= =?UTF-8?q?=E4=B8=81=EF=BC=8C=E5=8F=AA=E6=9C=89=E8=AF=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?patrol=5Ftask=E7=9A=84dev=5Ftype=E4=B8=BA2(=E5=8F=AF=E8=A7=81?= =?UTF-8?q?=E5=85=89=E7=B1=BB=E5=9E=8B)=E6=89=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=E5=85=89=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ivs/controller/IvsRecordController.java | 10 +++++----- .../java/com/inspect/job/task/JobMainTask.java | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) 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<>();