Browse Source

日志级别调整

master
wangguangyuan 4 weeks ago
parent
commit
a69d86c87a
4 changed files with 9 additions and 8 deletions
  1. +1
    -1
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java
  2. +6
    -6
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  3. +1
    -0
      inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java
  4. +1
    -1
      inspect-metadata/src/main/resources/logback.xml

+ 1
- 1
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java View File

@ -25,7 +25,7 @@ public class SyncDataToUpstreamService {
} }
public AjaxResult postMessage(String type, String msg) { public AjaxResult postMessage(String type, String msg) {
log.info("sendUrl: " + sendUrl);
log.debug("sendUrl: " + sendUrl);
try { try {
String resultJson = HttpClientUtils.postJson(sendUrl, msg, null); String resultJson = HttpClientUtils.postJson(sendUrl, msg, null);
AjaxResult ajaxResult = JSONObject.parseObject(resultJson, AjaxResult.class); AjaxResult ajaxResult = JSONObject.parseObject(resultJson, AjaxResult.class);


+ 6
- 6
inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java View File

@ -1934,7 +1934,7 @@ public class JobMainTask {
@SuppressWarnings({"unused"}) @SuppressWarnings({"unused"})
public void execEveryDayTask(List<PatrolTask> patrolTaskList) { public void execEveryDayTask(List<PatrolTask> patrolTaskList) {
log.info("***************************** JobTaskTimer execEveryDayTask with parameters *************************************");
log.debug("***************************** JobTaskTimer execEveryDayTask with parameters *************************************");
for (PatrolTask patrolTask : patrolTaskList) { for (PatrolTask patrolTask : patrolTaskList) {
List<PatrolTaskInfo> taskInfos = new ArrayList<>(); List<PatrolTaskInfo> taskInfos = new ArrayList<>();
String[] devTypes = patrolTask.getDevType().split(StringUtils.COMMA); String[] devTypes = patrolTask.getDevType().split(StringUtils.COMMA);
@ -1944,7 +1944,7 @@ public class JobMainTask {
taskInfos.addAll(infosByRecord); taskInfos.addAll(infosByRecord);
} }
log.info("execEveryDayTask taskInfos size: {}", taskInfos.size()); log.info("execEveryDayTask taskInfos size: {}", taskInfos.size());
log.info("execEveryDayTask patrolTask: {}", patrolTask);
log.debug("execEveryDayTask patrolTask: {}", patrolTask);
final String taskPatrolId = getTaskPatrolId(patrolTask); final String taskPatrolId = getTaskPatrolId(patrolTask);
final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask); final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask);
log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId);
@ -2042,7 +2042,7 @@ public class JobMainTask {
List<PatrolTask> patrolTaskListEx = new ArrayList<>(); List<PatrolTask> patrolTaskListEx = new ArrayList<>();
List<PatrolTask> patrolTaskControlList = new ArrayList<>(); List<PatrolTask> patrolTaskControlList = new ArrayList<>();
for (PatrolTask patrolTask : patrolTaskList) { 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()) if(StringUtils.isNotEmpty(patrolTask.getDevType())
&& patrolTask.getDevType().contains("2")) { && patrolTask.getDevType().contains("2")) {
patrolTaskListEx.add(patrolTask); patrolTaskListEx.add(patrolTask);
@ -2096,7 +2096,7 @@ public class JobMainTask {
@SuppressWarnings({"unused"}) @SuppressWarnings({"unused"})
public void execEveryDayTask() { public void execEveryDayTask() {
log.info("***************************** JobTaskTimer execEveryDayTask *************************************");
log.debug("***************************** JobTaskTimer execEveryDayTask *************************************");
Collection<String> redisKeys = redisService.keys(RedisConst.TASK_CODE_EX); Collection<String> redisKeys = redisService.keys(RedisConst.TASK_CODE_EX);
for (String redisKey : redisKeys) { for (String redisKey : redisKeys) {
@ -2141,7 +2141,7 @@ public class JobMainTask {
long diffMinutes = currentDate.getTime() - fixedDate.getTime(); 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())) { 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"); taskInfos.put(redisKey, "1");
extractRedisTask(redisKey, taskCode); extractRedisTask(redisKey, taskCode);
} }
@ -2155,7 +2155,7 @@ public class JobMainTask {
@SuppressWarnings({"unused"}) @SuppressWarnings({"unused"})
public void makeEveryDayTask() { public void makeEveryDayTask() {
log.info("***************************** JobTaskTimer makeEveryDayTask *************************************");
log.debug("***************************** JobTaskTimer makeEveryDayTask *************************************");
try { try {
taskExecClient.makeCurrentDayTask(); taskExecClient.makeCurrentDayTask();


+ 1
- 0
inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java View File

@ -116,6 +116,7 @@ public class PatrolDeviceStatusSynTask {
String resultCode = jsonObject.getString("resultCode"); String resultCode = jsonObject.getString("resultCode");
logger.debug(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")) { if (null != resultCode && resultCode.equals("0")) {
//摄像机设备信息V2版本列表根据请求中deviceType字段确定返回类型
JSONObject cameraBriefInfosV2 = jsonObject.getJSONObject("cameraBriefInfosV2"); JSONObject cameraBriefInfosV2 = jsonObject.getJSONObject("cameraBriefInfosV2");
if (null != cameraBriefInfosV2) { if (null != cameraBriefInfosV2) {
int total = cameraBriefInfosV2.getInteger("total"); int total = cameraBriefInfosV2.getInteger("total");


+ 1
- 1
inspect-metadata/src/main/resources/logback.xml View File

@ -62,7 +62,7 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.inspect" level="DEBUG" />
<logger name="com.inspect" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />


Loading…
Cancel
Save