From 05da1db451146cc3001c956d3b522ff989f102ea Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Wed, 3 Dec 2025 17:41:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=9015=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inspect-admin/src/main/resources/logback.xml | 8 ++++---- inspect-fastcall/src/main/resources/logback.xml | 8 ++++---- inspect-gateway/src/main/resources/logback.xml | 8 ++++---- inspect-ivs/src/main/resources/logback.xml | 8 ++++---- inspect-job/src/main/resources/logback.xml | 8 ++++---- .../inspect-main-start/src/main/resources/logback.xml | 8 ++++---- inspect-management/src/main/resources/logback.xml | 8 ++++---- inspect-metadata/src/main/resources/logback.xml | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/inspect-admin/src/main/resources/logback.xml b/inspect-admin/src/main/resources/logback.xml index 57a4ea3..70ae7fd 100644 --- a/inspect-admin/src/main/resources/logback.xml +++ b/inspect-admin/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-fastcall/src/main/resources/logback.xml b/inspect-fastcall/src/main/resources/logback.xml index 5979b08..bf5e999 100644 --- a/inspect-fastcall/src/main/resources/logback.xml +++ b/inspect-fastcall/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-gateway/src/main/resources/logback.xml b/inspect-gateway/src/main/resources/logback.xml index 98412ce..6caafd1 100644 --- a/inspect-gateway/src/main/resources/logback.xml +++ b/inspect-gateway/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-ivs/src/main/resources/logback.xml b/inspect-ivs/src/main/resources/logback.xml index d149ead..f7a9963 100644 --- a/inspect-ivs/src/main/resources/logback.xml +++ b/inspect-ivs/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-job/src/main/resources/logback.xml b/inspect-job/src/main/resources/logback.xml index 306fd8a..e6cff4b 100644 --- a/inspect-job/src/main/resources/logback.xml +++ b/inspect-job/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-main/inspect-main-start/src/main/resources/logback.xml b/inspect-main/inspect-main-start/src/main/resources/logback.xml index 6c73192..f3965ff 100644 --- a/inspect-main/inspect-main-start/src/main/resources/logback.xml +++ b/inspect-main/inspect-main-start/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-management/src/main/resources/logback.xml b/inspect-management/src/main/resources/logback.xml index 5aed3c9..8788c37 100644 --- a/inspect-management/src/main/resources/logback.xml +++ b/inspect-management/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} diff --git a/inspect-metadata/src/main/resources/logback.xml b/inspect-metadata/src/main/resources/logback.xml index b676773..656c1e7 100644 --- a/inspect-metadata/src/main/resources/logback.xml +++ b/inspect-metadata/src/main/resources/logback.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ ${log.path}/info/info.%d{yyyy-MM-dd}.%i.log ${log.maxFileSize} - + ${log.maxHistory} @@ -45,8 +45,8 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 15 ${log.pattern} From 19483a87a79ee1ae8cb21fbd868d197f07d82c38 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 4 Dec 2025 14:02:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?/*=E7=BA=A0=E5=81=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=9A=84=E6=99=BA=E5=B7=A1=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9A=E5=85=88?= =?UTF-8?q?=E5=8F=91=E9=80=8161=E5=86=8D=E5=8F=91=E9=80=8141=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E9=A2=A0=E5=80=92=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E4=B8=A4=E4=B8=AA=E6=8C=87=E4=BB=A4=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 47 +++++++++++++------ .../controller/PatrolTaskExecController.java | 8 ++-- .../controller/PatrolResultController.java | 26 ++++++++++ 3 files changed, 63 insertions(+), 18 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 8e98397..92299c0 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 @@ -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); diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java index 2d6c87f..86576b5 100644 --- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java +++ b/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 exeTimes = getExecTimes(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalEndTime()), intervalNumber); // List 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()) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 60ae52e..9eadae2 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/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 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 tasks = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(code).build()); From eae673c74e7b1e150c9dcf0601e140d352a4aeaf Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 4 Dec 2025 15:30:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?/*=E7=BA=A0=E5=81=8F=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A2000=E5=92=8C2001=E9=83=BD=E4=BC=9A?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BA=A0=E5=81=8F=E5=80=BC=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E5=9B=9B=E4=B8=AA=E5=80=BC=E9=83=BD=E6=98=AF0?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E9=9C=80=E8=A6=81=E7=BA=A0?= =?UTF-8?q?=E5=81=8F=EF=BC=8C=E5=85=B6=E5=AE=83=E6=83=85=E5=86=B5=E9=83=BD?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=BA=A0=E5=81=8F*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/utils/ResultAnalysisUtils.java | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index 11bb180..81db404 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -254,8 +254,8 @@ public class ResultAnalysisUtils { defaultDesc = "未检测到刀闸"; } } else if (algType.equals("correction")) { - log.info("parseAlg algType correction"); - if("2001".equals(resultAnalysis.getResCode())) { + log.info("parseAlg algType correction resCode: {}", resultAnalysis.getResCode()); + if("2000".equals(resultAnalysis.getResCode()) || "2001".equals(resultAnalysis.getResCode())) { ObjectMapper mapper = new ObjectMapper(); List> list; try { @@ -268,10 +268,28 @@ public class ResultAnalysisUtils { } if(list.size() == 2 && list.get(0).size() == 2 && list.get(1).size() == 2) { - resultAnalysis.setPointStatus("0"); - resultAnalysis.setResultType("0"); - resultAnalysis.setResStatus("3"); - defaultDesc = "请进行纠偏"; + final double EPSILON = 1e-8; + double value0 = list.get(0).get(0); + double value1 = list.get(0).get(1); + double value2 = list.get(1).get(0); + double value3 = list.get(1).get(1); + if (Math.abs(value0) < EPSILON && + Math.abs(value1) < EPSILON && + Math.abs(value2) < EPSILON && + Math.abs(value3) < EPSILON) { + log.info("correction no need value0: {}, value1: {}, value2: {}, value3: {}", value0, value1, value2, value3); + resultAnalysis.setPointStatus("1"); + resultAnalysis.setResultType("1"); + resultAnalysis.setResStatus("2"); + defaultDesc = messageUtils.get("正常"); + resultAnalysis.setResDesc(defaultDesc); + } else { + log.info("correction need value0: {}, value1: {}, value2: {}, value3: {}", value0, value1, value2, value3); + resultAnalysis.setPointStatus("0"); + resultAnalysis.setResultType("0"); + resultAnalysis.setResStatus("3"); + defaultDesc = "请进行纠偏"; + } } else { log.info("parseAlg algType correction value abnormal"); resultAnalysis.setPointStatus("0"); @@ -280,10 +298,10 @@ public class ResultAnalysisUtils { defaultDesc = "纠偏结果异常"; } } else { - resultAnalysis.setPointStatus("1"); - resultAnalysis.setResultType("1"); - resultAnalysis.setResStatus("2"); - defaultDesc = messageUtils.get("正常"); + resultAnalysis.setPointStatus("0"); + resultAnalysis.setResultType("0"); + resultAnalysis.setResStatus("0"); + defaultDesc = messageUtils.get("未知异常"); resultAnalysis.setResDesc(defaultDesc); } } else {