diff --git a/src/main/java/com/ycwl/basic/mapper/TaskMapper.java b/src/main/java/com/ycwl/basic/mapper/TaskMapper.java index 0c5a747..04ea4f3 100644 --- a/src/main/java/com/ycwl/basic/mapper/TaskMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/TaskMapper.java @@ -53,4 +53,6 @@ public interface TaskMapper { TaskEntity get(Long taskId); List listEntity(TaskReqQuery taskReqQuery); + + List selectNotRunningByScenicId(Long scenicOnly); } diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index 64227ee..eae14e6 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -185,7 +185,12 @@ public class TaskTaskServiceImpl implements TaskService { try { if (lock.tryLock(2, TimeUnit.SECONDS)) { try { - List taskList = taskMapper.selectNotRunning(); + List taskList; + if (worker.getScenicOnly() != null) { + taskList = taskMapper.selectNotRunningByScenicId(worker.getScenicOnly()); + } else { + taskList = taskMapper.selectNotRunning(); + } resp.setTasks(taskList); resp.setTemplates(updTemplateList); taskList.forEach(task -> { diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml index eacce13..92dfe70 100644 --- a/src/main/resources/mapper/TaskMapper.xml +++ b/src/main/resources/mapper/TaskMapper.xml @@ -82,7 +82,7 @@ +