From a69d86c87afa9553c45337b96e875c59039f226e Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Mon, 5 Jan 2026 13:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/core/service/SyncDataToUpstreamService.java | 2 +- .../main/java/com/inspect/job/task/JobMainTask.java | 12 ++++++------ .../inspect/job/task/PatrolDeviceStatusSynTask.java | 1 + inspect-metadata/src/main/resources/logback.xml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java index 66d4684..d41e445 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java @@ -25,7 +25,7 @@ public class SyncDataToUpstreamService { } public AjaxResult postMessage(String type, String msg) { - log.info("sendUrl: " + sendUrl); + log.debug("sendUrl: " + sendUrl); try { String resultJson = HttpClientUtils.postJson(sendUrl, msg, null); AjaxResult ajaxResult = JSONObject.parseObject(resultJson, AjaxResult.class); 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 fdf397c..e5c907b 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 @@ -1934,7 +1934,7 @@ public class JobMainTask { @SuppressWarnings({"unused"}) public void execEveryDayTask(List patrolTaskList) { - log.info("***************************** JobTaskTimer execEveryDayTask with parameters *************************************"); + log.debug("***************************** JobTaskTimer execEveryDayTask with parameters *************************************"); for (PatrolTask patrolTask : patrolTaskList) { List taskInfos = new ArrayList<>(); String[] devTypes = patrolTask.getDevType().split(StringUtils.COMMA); @@ -1944,7 +1944,7 @@ public class JobMainTask { taskInfos.addAll(infosByRecord); } log.info("execEveryDayTask taskInfos size: {}", taskInfos.size()); - log.info("execEveryDayTask patrolTask: {}", patrolTask); + log.debug("execEveryDayTask patrolTask: {}", patrolTask); final String taskPatrolId = getTaskPatrolId(patrolTask); final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask); log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); @@ -2042,7 +2042,7 @@ public class JobMainTask { List patrolTaskListEx = new ArrayList<>(); List patrolTaskControlList = new ArrayList<>(); for (PatrolTask patrolTask : patrolTaskList) { - log.info("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType()); + log.debug("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType()); if(StringUtils.isNotEmpty(patrolTask.getDevType()) && patrolTask.getDevType().contains("2")) { patrolTaskListEx.add(patrolTask); @@ -2096,7 +2096,7 @@ public class JobMainTask { @SuppressWarnings({"unused"}) public void execEveryDayTask() { - log.info("***************************** JobTaskTimer execEveryDayTask *************************************"); + log.debug("***************************** JobTaskTimer execEveryDayTask *************************************"); Collection redisKeys = redisService.keys(RedisConst.TASK_CODE_EX); for (String redisKey : redisKeys) { @@ -2141,7 +2141,7 @@ public class JobMainTask { long diffMinutes = currentDate.getTime() - fixedDate.getTime(); if (taskInfos.get(redisKey) == null && fixedDay.equals(currentDay) && (diffMinutes >= 0 && diffMinutes <= 60000 && fixedDate.before(currentDate) || fixedDate.getTime() == currentDate.getTime())) { - log.info(Color.YELLOW + "[JOB] TASK_CODE: {}, FIXED START TIME: {}" + Color.END, taskCode, fixedStartTime); + log.debug(Color.YELLOW + "[JOB] TASK_CODE: {}, FIXED START TIME: {}" + Color.END, taskCode, fixedStartTime); taskInfos.put(redisKey, "1"); extractRedisTask(redisKey, taskCode); } @@ -2155,7 +2155,7 @@ public class JobMainTask { @SuppressWarnings({"unused"}) public void makeEveryDayTask() { - log.info("***************************** JobTaskTimer makeEveryDayTask *************************************"); + log.debug("***************************** JobTaskTimer makeEveryDayTask *************************************"); try { taskExecClient.makeCurrentDayTask(); 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 1bdb094..2cd4998 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 @@ -116,6 +116,7 @@ public class PatrolDeviceStatusSynTask { String resultCode = jsonObject.getString("resultCode"); logger.debug(Color.MAGENTA + "synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}, result: {}" + Color.END, resultCode, jsonObject.toJSONString()); if (null != resultCode && resultCode.equals("0")) { + //摄像机设备信息V2版本列表（根据请求中deviceType字段确定返回类型） JSONObject cameraBriefInfosV2 = jsonObject.getJSONObject("cameraBriefInfosV2"); if (null != cameraBriefInfosV2) { int total = cameraBriefInfosV2.getInteger("total"); diff --git a/inspect-metadata/src/main/resources/logback.xml b/inspect-metadata/src/main/resources/logback.xml index 656c1e7..74d01a9 100644 --- a/inspect-metadata/src/main/resources/logback.xml +++ b/inspect-metadata/src/main/resources/logback.xml @@ -62,7 +62,7 @@ - +