From a5f67b1eacdafb70985da77bde76f95cd6538864 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 23 Mar 2025 17:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ycwl/basic/mapper/TaskMapper.java        | 2 ++
 .../ycwl/basic/service/task/impl/TaskTaskServiceImpl.java  | 7 ++++++-
 src/main/resources/mapper/TaskMapper.xml                   | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

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<TaskEntity> listEntity(TaskReqQuery taskReqQuery);
+
+    List<TaskRespVO> 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<TaskRespVO> taskList = taskMapper.selectNotRunning();
+                    List<TaskRespVO> 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 @@
     <select id="selectNotRunning" resultType="com.ycwl.basic.model.pc.task.resp.TaskRespVO">
         select id, worker_id, member_id, template_id, scenic_id, task_params, video_url, `status`, result, create_time, update_time
         from task
-        where status = 0 and worker_id is null
+        where status = 0 and worker_id is null and scenic_id not in (select scenic_only from render_worker where scenic_only is not null and status = 1)
         limit 1
     </select>
     <select id="selectAllNotRunning" resultType="com.ycwl.basic.model.pc.task.entity.TaskEntity">
@@ -133,4 +133,9 @@
         from task
         where status = 2
     </select>
+    <select id="selectNotRunningByScenicId" resultType="com.ycwl.basic.model.pc.task.resp.TaskRespVO">
+        select id, worker_id, member_id, template_id, scenic_id, task_params, video_url, `status`, result, create_time, update_time
+        from task
+        where status = 0 and worker_id is null and scenic_id = #{scenicId}
+    </select>
 </mapper>