From 6755c21349555e08a83abf19a494f9a7c508229b Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Fri, 18 Apr 2025 17:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BB=BB=E5=8A=A1=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=8F=AA=E6=89=A7=E8=A1=8C=E6=89=8B=E5=8A=A8=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 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 ce1ef48..5179023 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 @@ -942,45 +942,47 @@ public class JobMainTask { String[] devNos = task.getDevNo().split(StringUtils.COMMA); for (int i = 0; i < devTypes.length; ++i) { if ("2".equals(devTypes[i])) { - PatrolTask cameraPatrolTask = new PatrolTask(); - cameraPatrolTask.setTaskId(task.getTaskId()); - cameraPatrolTask.setStationName(task.getStationName()); - cameraPatrolTask.setStationCode(task.getStationCode()); - cameraPatrolTask.setType(task.getType()); - cameraPatrolTask.setTaskCode(task.getTaskCode()); - cameraPatrolTask.setTaskName(task.getTaskName()); - cameraPatrolTask.setPriority(task.getPriority()); - cameraPatrolTask.setDeviceLevel(task.getDeviceLevel()); - cameraPatrolTask.setDeviceList(task.getDeviceList()); - cameraPatrolTask.setFixedStartTime(task.getFixedStartTime()); - cameraPatrolTask.setCycleMonth(task.getCycleMonth()); - cameraPatrolTask.setCycleWeek(task.getCycleWeek()); - cameraPatrolTask.setCycleExecuteTime(task.getCycleExecuteTime()); - cameraPatrolTask.setCycleStartTime(task.getCycleStartTime()); - cameraPatrolTask.setCycleEndTime(task.getCycleEndTime()); - cameraPatrolTask.setIntervalNumber(task.getIntervalNumber()); - cameraPatrolTask.setIntervalType(task.getIntervalType()); - cameraPatrolTask.setIntervalExecuteTime(task.getIntervalExecuteTime()); - cameraPatrolTask.setIntervalStartTime(task.getIntervalStartTime()); - cameraPatrolTask.setIntervalEndTime(task.getIntervalEndTime()); - cameraPatrolTask.setInvalidStartTime(task.getInvalidStartTime()); - cameraPatrolTask.setInvalidEndTime(task.getInvalidEndTime()); - cameraPatrolTask.setIsEnable(task.getIsEnable()); - cameraPatrolTask.setLinkageState(task.getLinkageState()); - cameraPatrolTask.setDevType("2"); - cameraPatrolTask.setCreator(task.getCreator()); - cameraPatrolTask.setFileStatus(task.getFileStatus()); - cameraPatrolTask.setTaskCycle(task.getTaskCycle()); - cameraPatrolTask.setDevNo(devNos[i]); - cameraPatrolTask.setStorage(task.getStorage()); - cameraPatrolTask.setTaskProgress(task.getTaskProgress()); - cameraPatrolTask.setTaskState(task.getTaskState()); - cameraPatrolTask.setExecutionMode(task.getExecutionMode()); - cameraPatrolTask.setBeginTime(task.getBeginTime()); - cameraPatrolTask.setEndTime(task.getEndTime()); - cameraPatrolTask.setAreaId(task.getAreaId()); - cameraPatrolTask.setAreaName(task.getAreaName()); - cameraPatrolTasks.add(cameraPatrolTask); + if("camera".equals(devNos[i])) {//武汉站手动任务台账编码 + PatrolTask cameraPatrolTask = new PatrolTask(); + cameraPatrolTask.setTaskId(task.getTaskId()); + cameraPatrolTask.setStationName(task.getStationName()); + cameraPatrolTask.setStationCode(task.getStationCode()); + cameraPatrolTask.setType(task.getType()); + cameraPatrolTask.setTaskCode(task.getTaskCode()); + cameraPatrolTask.setTaskName(task.getTaskName()); + cameraPatrolTask.setPriority(task.getPriority()); + cameraPatrolTask.setDeviceLevel(task.getDeviceLevel()); + cameraPatrolTask.setDeviceList(task.getDeviceList()); + cameraPatrolTask.setFixedStartTime(task.getFixedStartTime()); + cameraPatrolTask.setCycleMonth(task.getCycleMonth()); + cameraPatrolTask.setCycleWeek(task.getCycleWeek()); + cameraPatrolTask.setCycleExecuteTime(task.getCycleExecuteTime()); + cameraPatrolTask.setCycleStartTime(task.getCycleStartTime()); + cameraPatrolTask.setCycleEndTime(task.getCycleEndTime()); + cameraPatrolTask.setIntervalNumber(task.getIntervalNumber()); + cameraPatrolTask.setIntervalType(task.getIntervalType()); + cameraPatrolTask.setIntervalExecuteTime(task.getIntervalExecuteTime()); + cameraPatrolTask.setIntervalStartTime(task.getIntervalStartTime()); + cameraPatrolTask.setIntervalEndTime(task.getIntervalEndTime()); + cameraPatrolTask.setInvalidStartTime(task.getInvalidStartTime()); + cameraPatrolTask.setInvalidEndTime(task.getInvalidEndTime()); + cameraPatrolTask.setIsEnable(task.getIsEnable()); + cameraPatrolTask.setLinkageState(task.getLinkageState()); + cameraPatrolTask.setDevType("2"); + cameraPatrolTask.setCreator(task.getCreator()); + cameraPatrolTask.setFileStatus(task.getFileStatus()); + cameraPatrolTask.setTaskCycle(task.getTaskCycle()); + cameraPatrolTask.setDevNo(devNos[i]); + cameraPatrolTask.setStorage(task.getStorage()); + cameraPatrolTask.setTaskProgress(task.getTaskProgress()); + cameraPatrolTask.setTaskState(task.getTaskState()); + cameraPatrolTask.setExecutionMode(task.getExecutionMode()); + cameraPatrolTask.setBeginTime(task.getBeginTime()); + cameraPatrolTask.setEndTime(task.getEndTime()); + cameraPatrolTask.setAreaId(task.getAreaId()); + cameraPatrolTask.setAreaName(task.getAreaName()); + cameraPatrolTasks.add(cameraPatrolTask); + } } } }