From c8fedf695fa74c6aedee1738617dd2e1adfac612 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Mon, 22 Sep 2025 13:39:47 +0800 Subject: [PATCH] =?UTF-8?q?/*=E6=94=B9=E4=BA=91=E6=B7=B1=E5=A4=84=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E7=8B=97=E6=94=B9=E5=87=BA=E6=9D=A5=E7=9A=84bug?= =?UTF-8?q?=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=91=A8=E6=9C=9F=E6=89=A7=E8=A1=8C?= =?UTF-8?q?*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/inspect/job/task/JobMainTask.java | 4 +++- .../com/inspect/job/task/PatrolDeviceStatusSynTask.java | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 2887c99..a35e52b 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 @@ -2022,7 +2022,9 @@ public class JobMainTask { // 筛选出可见光任务 List patrolTaskListEx = new ArrayList<>(); for (PatrolTask patrolTask : patrolTaskList) { - if("2".equals(patrolTask.getDevType())) { + log.info("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType()); + if(StringUtils.isNotEmpty(patrolTask.getDevType()) + && patrolTask.getDevType().contains("2")) { patrolTaskListEx.add(patrolTask); } } diff --git a/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java b/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java index 58023d2..1bdb094 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java @@ -114,18 +114,18 @@ public class PatrolDeviceStatusSynTask { try { JSONObject jsonObject = this.ivsFeign.channelListJson(new JSONObject()); String resultCode = jsonObject.getString("resultCode"); - logger.info(Color.MAGENTA + "synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}, result: {}" + Color.END, resultCode, jsonObject.toJSONString()); + logger.debug(Color.MAGENTA + "synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}, result: {}" + Color.END, resultCode, jsonObject.toJSONString()); if (null != resultCode && resultCode.equals("0")) { JSONObject cameraBriefInfosV2 = jsonObject.getJSONObject("cameraBriefInfosV2"); if (null != cameraBriefInfosV2) { int total = cameraBriefInfosV2.getInteger("total"); - logger.info("synPatrolEqpOnlineStatusFromGwbMedia2 cameraBriefInfosV2.total: {}", total); + logger.debug("synPatrolEqpOnlineStatusFromGwbMedia2 cameraBriefInfosV2.total: {}", total); if (total > 0) { JSONArray ivsJsonObjectItems = cameraBriefInfosV2.getJSONObject("cameraBriefInfoList").getJSONArray("cameraBriefInfo"); if (!ivsJsonObjectItems.isEmpty()) { Object basedata = basedataClient.list(new JSONObject()).getRows(); JSONArray patrolDeviceObjects = JSONArray.parseArray(JSONObject.toJSONString(basedata)); - logger.info("synPatrolEqpOnlineStatusFromGwbMedia2 patrolDeviceObjects size: {}", patrolDeviceObjects.size()); + logger.debug("synPatrolEqpOnlineStatusFromGwbMedia2 patrolDeviceObjects size: {}", patrolDeviceObjects.size()); Map ivsDeviceStatusMap = new HashMap<>(); if (!patrolDeviceObjects.isEmpty()) { for (int i = 0; i < ivsJsonObjectItems.size(); ++i) {