From 396376c09de4460d52df0618c3701723b58bbb31 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 1 Jul 2025 13:48:35 +0800 Subject: [PATCH] =?UTF-8?q?=20/*=20=20=20*=20=E6=99=BA=E8=83=BD=E5=B7=A1?= =?UTF-8?q?=E8=A7=86=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E5=AE=8C=E6=88=90?= =?UTF-8?q?100%,=20=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=8A=82=E7=82=B9=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=9B=B4=E6=96=B0task=5Fstate=E5=AD=97=E6=AE=B5,=20?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=A6=82=E4=B8=8B:=20=20=20*=201.=20?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=9B=B4=E6=96=B0task=5Fstate=E4=B8=BA?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81,=20?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=95=B4=E4=B8=AA=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E5=BA=94=E8=AF=A5=E7=94=B1?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=9D=A5=E5=86=B3=E5=AE=9A;=20=20=20*=202.=20?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=9B=B4=E6=96=B0task=5Fstate=E4=B8=BA?= =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E6=89=A7=E8=A1=8C=E7=8A=B6=E6=80=81,=20?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E5=9C=A8=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=8E=B0=E6=99=BA=E5=B7=A1=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=AF=94=E7=AE=97=E6=B3=95=E4=BB=BB=E5=8A=A1=E8=BE=BE=E5=88=B0?= =?UTF-8?q?100=E8=BF=9B=E5=BA=A6=E8=BF=98=E8=A6=81=E6=99=9A,=20=20=20*=20?= =?UTF-8?q?=20=20=20=E5=9B=A0=E6=AD=A4=E5=8E=9F=E6=9C=AC=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=B2=E7=BB=8F=E5=B0=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=BA=E4=BA=86=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=99=BA=E5=B7=A1=E4=BB=BB=E5=8A=A1=E5=86=8D=E6=8A=8A=E5=AE=83?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=89=A7=E8=A1=8C=E4=B8=AD=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E6=AD=A4=E6=97=B6=E5=8F=AA=E9=9C=80=E8=A6=81=20=20=20?= =?UTF-8?q?*=20=20=20=20=E6=9B=B4=E6=96=B0=E6=99=BA=E5=B7=A1=E7=9A=84?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=80=BC=E4=B8=BA100=E5=8D=B3=E5=8F=AF=20=20?= =?UTF-8?q?*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 4 ++-- .../service/impl/AnalysisServiceImpl.java | 16 +++++++++++--- .../controller/PatrolResultController.java | 22 ++++++++++++++++++- 3 files changed, 36 insertions(+), 6 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 6146bfb..10314e9 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 @@ -744,7 +744,7 @@ public class JobMainTask { // 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("totalProgress: {}, finish: {}, batchSize: {}, total: {}", totalProgress, finishedInfos.size(), infoListSize, total); + log.info("addCursorNumber totalProgress: {}, finish: {}, batchSize: {}, total: {}", totalProgress, finishedInfos.size(), infoListSize, total); callRemoteSendMsgRunMode( taskExecRecord.getTaskCode(), taskExecRecord.getTaskName(), @@ -794,7 +794,7 @@ public class JobMainTask { // List totalInfos = getInfosByRecord(execRecord); List finishedInfos = taskExecClient.selectPatrolTaskPointExecRecordList(PatrolTaskPointExecRecord.builder().oldTaskPatrolledId(execRecord.getOldTaskPatrolId()).build()); String totalProgress = decimalFormatNum(finishedInfos.size(), infoListSize); - log.info("totalProgress: {}, finish: {}, total: {}", totalProgress, finishedInfos.size(), infoListSize); + log.info("windUpRecord totalProgress: {}, finish: {}, total: {}", totalProgress, finishedInfos.size(), infoListSize); // callRemoteSendMsgRunMode( // execRecord.getTaskCode(), // execRecord.getTaskName(), diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java index 1e26102..57ebd84 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java @@ -894,8 +894,8 @@ public class AnalysisServiceImpl implements IAnalysisService { resultAnalysis.setFilter("1"); List resultAnalysisList = resultAnalysisService.selectResultAnalysisList(resultAnalysis); String algorithmProgress = decimalFormatNum(resultAnalysisList.size(), totalNumber); - log.info(Color.GREEN + "calcRemoteAlgorithmProgress: curNumber: {}, totalNumer: {}, algorithmProgress: {}" + Color.END, - resultAnalysisList.size(), totalNumber, algorithmProgress); +// log.info(Color.GREEN + "calcRemoteAlgorithmProgress: curNumber: {}, totalNumer: {}, algorithmProgress: {}, taskPatrolledId: {}" + Color.END, +// resultAnalysisList.size(), totalNumber, algorithmProgress, taskPatrolledId); PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus(); patrolTaskStatus.setTaskPatrolledId(taskPatrolledId); @@ -903,7 +903,17 @@ public class AnalysisServiceImpl implements IAnalysisService { if(!patrolTaskStatusList.isEmpty()) { patrolTaskStatus = patrolTaskStatusList.get(0); patrolTaskStatus.setTaskEstimatedTime(algorithmProgress); - patrolTaskStatus.setTaskState("100.0".equals(algorithmProgress) ? TaskStatus.DONE.getCode() : TaskStatus.RUNNING.getCode()); + if("100.0".equals(algorithmProgress)) { + patrolTaskStatus.setEndTime(DateUtil.formatDateTime(new Date())); + log.info(Color.GREEN + "DONE calcRemoteAlgorithmProgress: curNumber: {}, totalNumer: {}, algorithmProgress: {}, taskPatrolledId: {}, db-taskProgress: {}" + Color.END, + resultAnalysisList.size(), totalNumber, algorithmProgress, taskPatrolledId, patrolTaskStatus.getTaskProgress()); + patrolTaskStatus.setTaskProgress("100.0"); + patrolTaskStatus.setTaskState(TaskStatus.DONE.getCode()); + } else { + log.info(Color.GREEN + "RUNNING calcRemoteAlgorithmProgress: curNumber: {}, totalNumer: {}, algorithmProgress: {}, taskPatrolledId: {}" + Color.END, + resultAnalysisList.size(), totalNumber, algorithmProgress, taskPatrolledId); + patrolTaskStatus.setTaskState(TaskStatus.RUNNING.getCode()); + } patrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatus); } } 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 b0d4585..1d700b7 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 @@ -1149,7 +1149,27 @@ public class PatrolResultController extends BaseController { } logger.info(Color.CYAN + "updating patrol_task_status taskPatrolledId: {}, progress: {}, taskState: {}" + Color.END, patrolTaskStatusItem.getTaskPatrolledId(), patrolTaskStatusItem.getTaskProgress(), patrolTaskStatusItem.getTaskState()); - i = iPatrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatusItem); + + /* + * 智能巡视任务下发完成100%, 在这个节点不能更新task_state字段, 原因如下: + * 1. 不能更新task_state为已经完成状态, 因为整个任务的完成状态应该由算法任务是否完成来决定; + * 2. 不能更新task_state为正在执行状态, 因为在测试环境下发现智巡任务比算法任务达到100进度还要晚, + * 因此原本算法任务已经将状态置为已经完成的情况下为了防止智巡任务再把它改为执行中，所以此时只需要 + * 更新智巡的进度值为100即可 + */ + if("100.0".equals(patrolTaskStatusItem.getTaskProgress()) + && TaskStatus.RUNNING.getCode().equals(patrolTaskStatusItem.getTaskState())) { + List statusList = patrolTaskStatusService.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(patrolTaskStatusItem.getTaskPatrolledId()).build()); + if(!statusList.isEmpty()) { + logger.info(Color.CYAN + "updating patrol_task_status 100%, taskPatrolledId: {}, progress: {}, taskState: {}" + Color.END, + patrolTaskStatusItem.getTaskPatrolledId(), patrolTaskStatusItem.getTaskProgress(), patrolTaskStatusItem.getTaskState()); + PatrolTaskStatus taskStatus = statusList.get(0); + taskStatus.setTaskProgress(patrolTaskStatusItem.getTaskProgress()); + iPatrolTaskStatusService.updatePatrolTaskStatus(taskStatus); + } + } else { + i = iPatrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatusItem); + } if ("E100-001".equals(sendCode)) { if ("100".equals(patrolTaskStatusItem.getTaskProgress())) { saveDataToResultAnalysis(patrolTaskStatusItem.getTaskPatrolledId());