From 7439c436c276a56be2050a4eaa59fc52ccc67577 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Mon, 14 Apr 2025 09:30:29 +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=E5=90=88=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 14 ++++++++++++++ .../resultmain/domain/PatrolTaskResultMain.java | 2 ++ .../mapper/PatrolTaskResultMainMapper.java | 2 ++ .../service/IPatrolTaskResultMainService.java | 2 ++ .../impl/PatrolTaskResultMainServiceImpl.java | 4 ++++ .../controller/PatrolTaskStatusController.java | 1 + .../mapper/task/PatrolTaskResultMainMapper.xml | 9 +++++++++ 7 files changed, 34 insertions(+) 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 6235cce..1b6e5cf 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 @@ -1210,6 +1210,20 @@ public class PatrolResultController extends BaseController { patrolTaskResultMain.setFileStatus("0"); patrolTaskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId()); + int devCount = tasks.get(0).getDevNo().split(",").length; + if(devCount > 1) { + PatrolTaskResultMain resultMainQuery = new PatrolTaskResultMain(); + resultMainQuery.setTaskId(String.valueOf(tasks.get(0).getTaskId())); + //select unified_task_patrolled_id from patrol_task_result_main where task_id = #{taskId} and file_status = 0 and (now() - create_time) <= 120 ORDER BY line_id desc limit 1 + String unifiedTaskPatrolledId = iPatrolTaskResultMainService.selectUnifiedTaskPatrolledId(resultMainQuery); + if(unifiedTaskPatrolledId != null) { + patrolTaskResultMain.setUnifiedTaskPatrolledId(unifiedTaskPatrolledId); + } else { + patrolTaskResultMain.setUnifiedTaskPatrolledId(taskResultMain.getTaskId() + "_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())); + } + } else { + patrolTaskResultMain.setUnifiedTaskPatrolledId(taskResultMain.getTaskId() + "_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())); + } patrolTaskResultMain.setTaskCode(tasks.get(0).getTaskCode()); patrolTaskResultMain.setTaskName(tasks.get(0).getTaskName()); patrolTaskResultMain.setTaskType(tasks.get(0).getType()); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/domain/PatrolTaskResultMain.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/domain/PatrolTaskResultMain.java index bdd7a2d..0be770e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/domain/PatrolTaskResultMain.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/domain/PatrolTaskResultMain.java @@ -74,6 +74,8 @@ public class PatrolTaskResultMain extends BaseEntity { ) private String checkPerson; private String taskPatrolledId; + private String unifiedTaskPatrolledId; + @JsonFormat( pattern = "yyyy-MM-dd" ) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java index 98f03e2..0a12a1a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java @@ -13,6 +13,8 @@ public interface PatrolTaskResultMainMapper { List selectPatrolTaskResultMain(PatrolTaskResultMain resultMain); + String selectUnifiedTaskPatrolledId(PatrolTaskResultMain resultMain); + int insertPatrolTaskResultMain(PatrolTaskResultMain resultMain); int updatePatrolTaskResultMain(PatrolTaskResultMain resultMain); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java index ae40cce..6135a81 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java @@ -11,6 +11,8 @@ public interface IPatrolTaskResultMainService { List selectPatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain); + String selectUnifiedTaskPatrolledId(PatrolTaskResultMain patrolTaskResultMain); + int insertPatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain); int updatePatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java index 2a29b78..0fc851c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java @@ -30,6 +30,10 @@ public class PatrolTaskResultMainServiceImpl implements IPatrolTaskResultMainSer return this.patrolTaskResultMainMapper.selectPatrolTaskResultMain(patrolTaskResultMain); } + public String selectUnifiedTaskPatrolledId(PatrolTaskResultMain patrolTaskResultMain) { + return this.patrolTaskResultMainMapper.selectUnifiedTaskPatrolledId(patrolTaskResultMain); + } + public int insertPatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain) { patrolTaskResultMain.setCreateTime(DateUtils.getNowDate()); this.patrolTaskResultMainMapper.insertPatrolTaskResultMain(patrolTaskResultMain); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index f5e8f7b..5527ca3 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -670,6 +670,7 @@ public class PatrolTaskStatusController extends BaseController { return toAjax(1); } + //设置任务暂停或终止接口 @GetMapping({"/taskStatusChange"}) public AjaxResult taskStatusChange(PatrolTaskStatus params) { if (StringUtils.isEmpty(params.getLineId() + "")) { 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 f6ffef1..a23c408 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 @@ -22,12 +22,14 @@ + select line_id, task_id, task_patrolled_id, + unified_task_patrolled_id, task_name, task_code, create_time, @@ -114,6 +116,10 @@ ORDER BY a.line_id desc + +