/*1. job微服务完善日志打印方便问题排查；2.

巡检任务详情：初筛结果列表中存在空值展示，将空值过滤掉。*/

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<PatrolTaskInfo> totalInfos = getInfosByRecord(taskExecRecord);
         List<PatrolTaskPointExecRecord> 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<PatrolTaskInfo> 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: {}",

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());
             }