From 7399d9e25fc35ccdc48a65483db980e437b2977c Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 9 Sep 2025 09:12:00 +0800 Subject: [PATCH] =?UTF-8?q?/*1.=20job=E5=BE=AE=E6=9C=8D=E5=8A=A1=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=8E=92=E6=9F=A5=EF=BC=9B2.=20=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=EF=BC=9A=E5=88=9D?= =?UTF-8?q?=E7=AD=9B=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8=E4=B8=AD=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=A9=BA=E5=80=BC=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E8=BF=87=E6=BB=A4=E6=8E=89=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 39 +++++++++++++------ .../task/controller/PatrolTaskController.java | 2 +- 2 files changed, 28 insertions(+), 13 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 fa65dcd..2ef7b59 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 @@ -33,7 +33,6 @@ import com.inspect.system.base.domain.SysDictData; import java.net.URLConnection; import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -564,8 +563,12 @@ public class JobMainTask { + "&realtime=true&code=" + presetPos.getChannelCode(); final String algSubtypeCode = algSubtypeIdMap == null ? StringUtils.EMPTY : algSubtypeIdMap.getOrDefault(AlgConstants.ALG_SUBTYPE_CODE, StringUtils.EMPTY); - log.info("INFRARED_PROC, chanType: {}, patrolPointId: {}, algorithmTypeMap: {}， algSubtypeCode: {}", - chanType, presetPos.getPatrolPointId(), algSubtypeIdMap, algSubtypeCode); + log.info("INFRARED_PROC, taskPatrolId: {}, chanType: {}, patrolPointId: {}, algorithmTypeMap: {}， algSubtypeCode: {}", + taskExecRecord.getOldTaskPatrolId(), + chanType, + presetPos.getPatrolPointId(), + algSubtypeIdMap, + algSubtypeCode); if (algSubtypeCode.contains(AlgConstants.INFRA_1800) || algSubtypeCode.contains(AlgConstants.INFRA_YU3) || algSubtypeCode.contains(AlgConstants.INFRA_CAMERA) @@ -719,7 +722,8 @@ public class JobMainTask { String rectangle = getRectangle(presetPos.getPresetPosId()); String taskPatrolId = getTaskPatrolledId(taskInfo.getDevNo(), taskExecRecord.getTaskPatrolId()); final String deviceId = taskInfo.getDeviceId(); - log.info("pointExecRecord crud add taskPatrolId: {}, patrolPointId: {}", taskPatrolId, deviceId); + log.info("ADD_POINT_RECORD crud add taskPatrolId: {}, patrolPointId: {}", + taskExecRecord.getOldTaskPatrolId(), deviceId); PatrolTaskPointExecRecord pointExecRecord = PatrolTaskPointExecRecord .builder() @@ -740,7 +744,8 @@ public class JobMainTask { .isOk(1) .build(); taskExecClient.addPatrolTaskPointExecRecord(pointExecRecord); - log.info(Color.RED + "pointExecRecord crud add taskPatrolId: {}, deviceId: {}" + Color.END, taskPatrolId, deviceId); + log.info(Color.RED + "ADD_POINT_2_RECORD crud add taskPatrolId: {}, deviceId: {}" + Color.END, + taskExecRecord.getOldTaskPatrolId(), deviceId); //if(!testMode) { String patrolId = taskExecRecord.getTaskPatrolId(); @@ -835,14 +840,23 @@ public class JobMainTask { taskExecRecord.setCursorNumber(cursor); //if (bOk) { success++; - log.info("execute point success, cursor: {}, success: {}, total: {}", cursor, success, total); + log.info("EXECUTE_POINT_SUCCESS taskPatrolId: {}, cursor: {}, success: {}, total: {}", + taskExecRecord.getOldTaskPatrolId(), + cursor, + success, + total); taskExecRecord.setFinishNumber(success); String taskProgress = decimalFormatNum(success, total);// task_progress=success/total -> patrol_task_exec_record taskExecRecord.setTaskProgress(taskProgress); // List totalInfos = getInfosByRecord(taskExecRecord); List finishedInfos = taskExecClient.selectPatrolTaskPointExecRecordList(PatrolTaskPointExecRecord.builder().oldTaskPatrolledId(taskExecRecord.getOldTaskPatrolId()).build()); String totalProgress = decimalFormatNum(finishedInfos.size(), total);// task_progress=finish/total -> patrol_task_status - log.info("addCursorNumber totalProgress: {}, finish: {}, batchSize: {}, total: {}", totalProgress, finishedInfos.size(), infoListSize, total); + log.info("EXECUTE_POINT_ADD_CURSOR taskPatrolId: {}, totalProgress: {}, finish: {}, batchSize: {}, total: {}", + taskExecRecord.getOldTaskPatrolId(), + totalProgress, + finishedInfos.size(), + infoListSize, + total); callRemoteSendMsgRunMode( taskExecRecord.getTaskCode(), taskExecRecord.getTaskName(), @@ -959,13 +973,14 @@ public class JobMainTask { PatrolTaskExecRecord taskExecRecordEx = taskExecClient.selectPatrolTaskExecRecordByTaskPatrolId(taskExecRecord.getTaskPatrolId()); int totalNumber = taskExecRecordEx.getTotalNumber(); - log.info(Color.CYAN + "addCursorNumberEnd: cursorNumber: {}, batchNumber: {}, total: {}" + Color.END, cursorNumber, infoListSize, totalNumber); + log.info(Color.CYAN + "ADD_CURSOR_NUMBER_END taskPatrolId: {}, cursorNumber: {}, batchNumber: {}, total: {}" + Color.END, + taskExecRecordEx.getOldTaskPatrolId(), cursorNumber, infoListSize, totalNumber); //if (cursorNumber == infoListSize) {// devNo下对应的点执行完毕 if (cursorNumber == totalNumber) {// devNo下对应的点执行完毕 - log.info(Color.CYAN + "**************************windUpRecord start" + Color.END); + log.info(Color.CYAN + "WINDUP_RECORD_START taskPatrolId: {}" + Color.END, taskExecRecord.getOldTaskPatrolId()); windUpRecord(taskExecRecord.getTaskPatrolId(), infoListSize); - log.info(Color.CYAN + "**************************windUpRecord end" + Color.END); + log.info(Color.CYAN + "WINDUP_RECORD_END taskPatrolId: {}" + Color.END, taskExecRecord.getOldTaskPatrolId()); } return taskExecRecord; @@ -1333,7 +1348,7 @@ public class JobMainTask { } CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); - consummateCompletedTask(patrolTaskExecRecord); + completedTaskConsummate(patrolTaskExecRecord); } private void handlePrePointBatch(final int threadCnt, final PatrolTaskExecRecord patrolTaskExecRecord, final List taskInfoBatch) { @@ -1382,7 +1397,7 @@ public class JobMainTask { } } - private void consummateCompletedTask(final PatrolTaskExecRecord patrolTaskExecRecord) { + private void completedTaskConsummate(final PatrolTaskExecRecord patrolTaskExecRecord) { TaskStatusManager.remove(patrolTaskExecRecord.getOldTaskPatrolId()); boolean isConsummate = redisService.deleteObjectOfTask(RedisConst.TASK_CURRENT_CODE, patrolTaskExecRecord.getTaskCode()); log.info("CONSUMMATE_COMPLETED_TASK taskPatrolId: {}, isConsummate: {}", diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 2827b8d..694cfae 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -3021,7 +3021,7 @@ public class PatrolTaskController extends BaseController { listDesc.add(item.getDesc()); } - if (!listFilterDesc.contains(item.getFilterDesc()) && !"".equals(item.getFilterDesc())) { + if (!listFilterDesc.contains(item.getFilterDesc()) && StringUtils.isNotEmpty(item.getFilterDesc())) { listFilterDesc.add(item.getFilterDesc()); }