From ef6a332a7d458f8e9af46677a17e56f04e470f4c Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Mon, 7 Apr 2025 09:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E5=B7=A1=E8=A7=86=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8A=A5=E5=91=8A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 17 +++---- .../controller/PatrolResultController.java | 12 +++-- .../task/PatrolTaskResultMainMapper.xml | 47 +------------------ 3 files changed, 20 insertions(+), 56 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 438e1ff..577a9b0 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 @@ -92,8 +92,8 @@ public class JobMainTask { private String activeProfile; //private static final ExecutorService threadPool = Executors.newFixedThreadPool(2); - private static final int corePoolSize = 2; - private static final int maximumPoolSize = 5; + private static final int corePoolSize = 20; + private static final int maximumPoolSize = 50; private static final int keepAliveTime = 100; private static final ExecutorService threadPool = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, TimeUnit.SECONDS, new LinkedBlockingQueue<>(1000)); @@ -557,7 +557,7 @@ public class JobMainTask { String patrolId = taskExecRecord.getTaskPatrolId(); String[] ids = patrolId.split(StringUtils.UNDERLINE); String taskPatrolIdRemote = ids[1] + "_" + ids[2]; - callRemoteSendMsgCtrlMode(taskPatrolIdRemote, pointExecRecord); + callRemoteSendMsgCtrlMode(taskPatrolIdRemote, pointExecRecord);/*上报巡视结果*/ } } @@ -656,7 +656,7 @@ public class JobMainTask { taskExecRecord.getTaskName(), taskExecRecord.getTaskPatrolId(), totalProgress, - TaskStatus.RUNNING.getCode() + TaskStatus.RUNNING.getCode()/*运行中百分比上报*/ ); } taskExecClient.updatePatrolTaskExecRecord(taskExecRecord); @@ -703,7 +703,7 @@ public class JobMainTask { execRecord.getTaskName(), execRecord.getTaskPatrolId(), totalProgress, - TaskStatus.DONE.getCode() + TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/ ); final Integer redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT); log.info(Color.MAGENTA + "RECORD ROUND, patrolId: {}, recordCounter: {}, redisRecCnt: {}" + Color.END, taskPatrolId, execRecordCounter, redisRecCnt); @@ -724,7 +724,7 @@ public class JobMainTask { execRecord.getTaskName(), execRecord.getTaskPatrolId(), totalProgress, - TaskStatus.DONE.getCode() + TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/ ); //在不知道其它record是否执行完毕的情况下，不能把TASK_CURRENT_CODE锁删除 final int redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT); @@ -851,7 +851,7 @@ public class JobMainTask { assembleVideoTask(patrolTaskList, cameraPatrolTasks); String redisImmediatelyExecTaskTime = redisService.getCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME); if (redisImmediatelyExecTaskTime != null) { - log.info(Color.RED + "[JOB IMMEDIATE] IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime); + log.info(Color.CYAN + "[JOB IMMEDIATE] IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime); return; } @@ -865,7 +865,7 @@ public class JobMainTask { log.info(Color.CYAN + "[JOB IMMEDIATE] TASK_CURRENT_CODE: {}, value: {}" + Color.END, RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime); redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime); resetRecordCounter(); - log.info(Color.CYAN + "[JOB IMMEDIATE] TASK REC CNT: {}" + Color.END, cameraPatrolTasks.size()); + log.info(Color.CYAN + "[JOB IMMEDIATE] TASK REC CNT: {}" + Color.END, cameraPatrolTasks.size());//TASK REC CNT: 1 setRedisRecordCount(cameraPatrolTasks.size()); for (PatrolTask task : cameraPatrolTasks) { List taskInfos = getInfosByRecord(PatrolTaskExecRecord.builder().devNo(task.getDevNo()).taskId(task.getTaskId()).build()); @@ -986,6 +986,7 @@ public class JobMainTask { private void prePointExecImmediate(final PatrolTaskExecRecord patrolTaskExecRecord) { final List patrolTaskInfoList = getInfosByRecord(patrolTaskExecRecord); + //patrolTaskInfoList size: 12 devNo: camera, taskId: 10032 log.info(Color.CYAN + "[JOB] EXEC patrolTaskInfoList size: {} devNo: {}, taskId: {}" + Color.END, patrolTaskInfoList.size(), patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId()); for (final PatrolTaskInfo taskInfo : patrolTaskInfoList) { log.info(Color.CYAN + "[JOB] EXEC Immediate Progress: {}, id: {}, taskInfo: {}" + Color.END, patrolTaskExecRecord.getTaskProgress(), patrolTaskExecRecord.getTaskPatrolId() + "@@@" + patrolTaskExecRecord.getTaskPatrolId(), "deviceId:" + taskInfo.getDeviceId() + " LineId=" + taskInfo.getLineId()); 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 3b25cf0..bfeba0c 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 @@ -1194,9 +1194,15 @@ public class PatrolResultController extends BaseController { List tasks = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(code).build()); String datetype; if (!tasks.isEmpty()) { + int devCount = tasks.get(0).getDevNo().split(",").length; PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain(); taskResultMain.setTaskId(String.valueOf(tasks.get(0).getTaskId())); - taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId()); + if(devCount > 1) { + taskResultMain.setFileStatus("0"); + } else { + taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId()); + } + logger.info("taskResultMain: {}", taskResultMain); listEqpBook = iPatrolTaskResultMainService.selectPatrolTaskResultMainList(taskResultMain); if (!listEqpBook.isEmpty()) { @@ -1231,7 +1237,7 @@ public class PatrolResultController extends BaseController { patrolTaskResultMain.setDevType(tasks.get(0).getDevType()); } - mainID = iPatrolTaskResultMainService.insertPatrolTaskResultMain(patrolTaskResultMain); + mainID = iPatrolTaskResultMainService.insertPatrolTaskResultMain(patrolTaskResultMain);// logger.info("insert PatrolTaskResultMain Id: {}", mainID); } } @@ -1391,7 +1397,7 @@ public class PatrolResultController extends BaseController { } } - i = patrolResultService.insertPatrolResult(arr); + i = patrolResultService.insertPatrolResult(arr);// resultStatistics.compare(arr); // if (!"2".equals(Jqtype)) { resultList.add(arr); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml index 696cc45..f6ffef1 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml @@ -45,50 +45,7 @@ from patrol_task_result_main - and task_id = #{taskId} @@ -109,7 +66,7 @@ and check_time = #{checkTime} and task_patrolled_id = #{taskPatrolledId} - ORDER BY line_id desc + ORDER BY line_id desc limit 1