/*纠偏任务发现的智巡任务流程的问题：先发送61再发送41会有问题，颠倒一下两个指令的流程*/

inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java

@@ -714,7 +714,7 @@ public class JobMainTask {
         return rectangles.toString();
     }
 
-    synchronized private void addPointRecord(PatrolTaskExecRecord taskExecRecord,
+    synchronized private PatrolTaskPointExecRecord addPointRecord(PatrolTaskExecRecord taskExecRecord,
                                              PatrolTaskInfo taskInfo,
                                              PatrolPresetPosSlim presetPos,
                                              StringBuffer fileTypes,
@@ -747,12 +747,13 @@ public class JobMainTask {
         log.info(Color.RED + "ADD_POINT_2_RECORD crud add taskPatrolId: {}, deviceId: {}" + Color.END,
                 taskExecRecord.getOldTaskPatrolId(), deviceId);
         //if(!testMode)
-        {
-            String patrolId = taskExecRecord.getTaskPatrolId();
-            String[] ids = patrolId.split(StringUtils.UNDERLINE);
-            String taskPatrolIdRemote = ids[1] + "_" + ids[2];
-            callRemoteSendMsgCtrlMode(taskPatrolIdRemote, taskExecRecord.getTotalAlgorithmNumber(), pointExecRecord);/*上报巡视结果*/
-        }
+//        {
+//            String patrolId = taskExecRecord.getTaskPatrolId();
+//            String[] ids = patrolId.split(StringUtils.UNDERLINE);
+//            String taskPatrolIdRemote = ids[1] + "_" + ids[2];
+//            callRemoteSendMsgCtrlMode(taskPatrolIdRemote, taskExecRecord.getTotalAlgorithmNumber(), pointExecRecord);/*上报巡视结果*/
+//        }
+        return pointExecRecord;
     }
 
     private void callRemoteSendMsgRunMode(final String taskCode, final String taskName, final String taskPatrolId, final String taskProgress, final String state) {
@@ -822,7 +823,10 @@ public class JobMainTask {
         }
     }
 
-    synchronized private int addCursorNumber(String taskPatrolId, int infoListSize) {
+    synchronized private int addCursorNumber(String taskPatrolId,
+                                             int infoListSize,
+                                             PatrolTaskPointExecRecord pointExecRecord,
+                                             int totalAlgorithNumber) {
         PatrolTaskExecRecord taskExecRecord = taskExecClient.selectPatrolTaskExecRecordByTaskPatrolId(taskPatrolId);
 
         int total = taskExecRecord.getTotalNumber();
@@ -840,11 +844,12 @@ public class JobMainTask {
         taskExecRecord.setCursorNumber(cursor);
         //if (bOk) {
         success++;
-        log.info("EXECUTE_POINT_SUCCESS taskPatrolId: {}, cursor: {}, success: {}, total: {}",
+        log.info("EXECUTE_POINT_SUCCESS taskPatrolId: {}, cursor: {}, success: {}, total: {}, totalAlgorithNumber: {}",
                 taskExecRecord.getOldTaskPatrolId(),
                 cursor,
                 success,
-                total);
+                total,
+                totalAlgorithNumber);
         taskExecRecord.setFinishNumber(success);
         String taskProgress = decimalFormatNum(success, total);// task_progress=success/total -> patrol_task_exec_record
         taskExecRecord.setTaskProgress(taskProgress);
@@ -864,6 +869,19 @@ public class JobMainTask {
                 totalProgress,
                 TaskStatus.RUNNING.getCode()/*运行中百分比上报*/
         );
+
+        try {
+            Thread.sleep(1000);
+        } catch (Exception e) {
+            log.error("error", e);
+        }
+
+        {
+            String patrolId = taskExecRecord.getTaskPatrolId();
+            String[] ids = patrolId.split(StringUtils.UNDERLINE);
+            String taskPatrolIdRemote = ids[1] + "_" + ids[2];
+            callRemoteSendMsgCtrlMode(taskPatrolIdRemote, totalAlgorithNumber, pointExecRecord);/*上报巡视结果*/
+        }
 //        }
 //        else {
 //            log.info("execute point fail, cursor: {}, success: {}, total: {}", cursor, success, total);
@@ -956,8 +974,9 @@ public class JobMainTask {
             StringBuffer filePaths) {
 
         //log.info(Color.CYAN + "recordPersistTrace bOk: {}" + Color.END, bOk);
+        PatrolTaskPointExecRecord patrolTaskPointExecRecord = null;
         try {
-            addPointRecord(taskExecRecord, taskInfo, presetPos, fileTypes, filePaths);
+            patrolTaskPointExecRecord = addPointRecord(taskExecRecord, taskInfo, presetPos, fileTypes, filePaths);
         } catch (Exception e) {
             log.error("error", e);
         }
@@ -966,7 +985,7 @@ public class JobMainTask {
         log.info(Color.CYAN + "addCursorNumberStart" + Color.END);
         int cursorNumber = 0;
         try {
-            cursorNumber = addCursorNumber(taskExecRecord.getTaskPatrolId(), infoListSize);
+            cursorNumber = addCursorNumber(taskExecRecord.getTaskPatrolId(), infoListSize, patrolTaskPointExecRecord, taskExecRecord.getTotalAlgorithmNumber());
         } catch (Exception e) {
             log.error("error", e);
         }
@@ -2091,9 +2110,9 @@ public class JobMainTask {
                         continue;
                     }
                     String isEnable = patrolTasks.get(0).getIsEnable();
-                    log.info("---execEveryDayTask isEnable: {}, taskCode: {}", isEnable, taskCode);
+                        log.debug("---execEveryDayTask isEnable: {}, taskCode: {}", isEnable, taskCode);
                     if (isTaskSlotEmpty(taskCode) && "0".equals(isEnable)) {
-                        log.info(Color.YELLOW + "[JOB] TASK_CODE: {}" + Color.END, taskCode);
+                        log.debug(Color.YELLOW + "[JOB] TASK_CODE: {}" + Color.END, taskCode);
 //                        long currentTime = System.currentTimeMillis();
 //                        long currentDays = TimeUnit.MILLISECONDS.toDays(currentTime);
 //                        long currentMinutes = TimeUnit.MILLISECONDS.toMinutes(currentTime);

inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java

@@ -568,7 +568,7 @@ public class PatrolTaskExecController extends BaseController {
                             List<Date> exeTimes = getExecTimes(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalEndTime()), intervalNumber);
 //                            List<Date> exeTimes = getExecTimesOld(task.getIntervalExecuteTime(), intervalNumber);
                             for (Date exeTime : exeTimes) {
-                                logger.info("[TASK] {}， isInterTaskByHour exeTime: {}", task.getTaskCode(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, exeTime));
+                                logger.debug("[TASK] {}， isInterTaskByHour exeTime: {}", task.getTaskCode(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, exeTime));
                                 task.setFixedStartTime(exeTime);
                                 final String taskType = "INTER-BY-HOUR";
                                 parseTaskToRedis(taskType, task, task.getIntervalEndTime());
@@ -654,7 +654,7 @@ public class PatrolTaskExecController extends BaseController {
                             }
                         }
                     }
-                    logger.info(Color.GREEN + "[TASK] TYPE: {}, CYCLE BY WEEK key: {}, patrolId: {}" + Color.END, taskType, key, taskPatrolledId);
+                    logger.debug(Color.GREEN + "[TASK] TYPE: {}, CYCLE BY WEEK key: {}, patrolId: {}" + Color.END, taskType, key, taskPatrolledId);
                     redisService.setCacheObject(key, JSONArray.toJSONString(patrolTasks));
                 }
             }
@@ -888,8 +888,8 @@ public class PatrolTaskExecController extends BaseController {
         }
         String devNoListStr = StringUtils.join(devNoList, StringUtils.COMMA);
         String devTypeListStr = StringUtils.join(devTypeList, StringUtils.COMMA);
-        log.info("[TASK] devNoListStr: {}", devNoListStr);
-        log.info("[TASK] devTypeListStr: {}", devTypeListStr);
+        log.debug("[TASK] devNoListStr: {}", devNoListStr);
+        log.debug("[TASK] devTypeListStr: {}", devTypeListStr);
         PatrolTask patrolTask = PatrolTask.builder()
                 .taskId(task.getTaskId())
                 .stationName(task.getStationName())

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1363,6 +1363,32 @@ public class PatrolResultController extends BaseController {
 
                     code = arr.getTaskCode();
                     patrolDeviceCodeList.add(arr.getPatrolDeviceCode());
+
+                    //qinyl
+//                    String taskPatrolledId = arr.getTaskPatrolledId();
+//                    String taskCode = arr.getTaskCode();
+//                    String taskName = arr.getTaskName();
+//                    logger.info("CMD_61 taskPatrolledId: {}", taskPatrolledId);
+//                    if(StringUtils.isNotEmpty(taskPatrolledId)) {
+//                        PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus();
+//                        patrolTaskStatus.setTaskPatrolledId(taskPatrolledId);
+//                        List<PatrolTaskStatus> patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
+//                        logger.info("CMD_61 patrolTaskStatusList size: {}", patrolTaskStatusList.size());
+//                        if(patrolTaskStatusList.isEmpty()) {
+//                            PatrolTaskStatus patrolTaskStatusItem = new PatrolTaskStatus();
+//                            patrolTaskStatusItem.setTaskPatrolledId(taskPatrolledId);
+//                            patrolTaskStatusItem.setTaskCode(taskCode);
+//                            patrolTaskStatusItem.setTaskName(taskName);
+//                            patrolTaskStatusItem.setTaskState("2");
+//                            patrolTaskStatusItem.setTaskProgress("0");
+//                            patrolTaskStatusItem.setTaskEstimatedTime("0");
+//                            patrolTaskStatusItem.setCreateTime(new Date());
+//                            patrolTaskStatusItem.setStartTime(new Date());
+//                            patrolTaskStatusItem.setTaskEstimatedTime("");
+//                            i = iPatrolTaskStatusService.insertPatrolTaskStatus(patrolTaskStatusItem);
+//                            logger.info("CMD_61 CREATE patrol_task_status record taskPatrolledId: {}, i: {}", taskPatrolledId, i);
+//                        }
+//                    }
                 }
 
                 List<PatrolTask> tasks = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(code).build());