From 45409ba1abeece34e2896c1cff274509617cbb82 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 12 Apr 2025 14:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=9C=BA=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BB=85=E6=B8=B2=E6=9F=93=E5=87=A0=E4=B8=AA=E6=99=AF=E5=8C=BA?=
 =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ycwl/basic/mapper/TaskMapper.java    |  2 +-
 .../renderWorker/entity/RenderWorkerEntity.java   |  2 +-
 .../service/task/impl/TaskTaskServiceImpl.java    |  2 +-
 src/main/resources/mapper/TaskMapper.xml          | 15 ++++++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/mapper/TaskMapper.java b/src/main/java/com/ycwl/basic/mapper/TaskMapper.java
index 04ea4f3..92a2c6e 100644
--- a/src/main/java/com/ycwl/basic/mapper/TaskMapper.java
+++ b/src/main/java/com/ycwl/basic/mapper/TaskMapper.java
@@ -54,5 +54,5 @@ public interface TaskMapper {
 
     List<TaskEntity> listEntity(TaskReqQuery taskReqQuery);
 
-    List<TaskRespVO> selectNotRunningByScenicId(Long scenicOnly);
+    List<TaskRespVO> selectNotRunningByScenicList(String scenicOnly);
 }
diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java
index 42e34fe..e8767d7 100644
--- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java
+++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java
@@ -60,7 +60,7 @@ public class RenderWorkerEntity {
     /**
      * 是否仅用于指定景区，空或0不适用，否则为景区ID
      */
-    private Long scenicOnly;
+    private String scenicOnly;
     /**
      * 是否仅用于测试，0不是，1是
      */
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 b6971dd..0cf4403 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
@@ -191,7 +191,7 @@ public class TaskTaskServiceImpl implements TaskService {
                 try {
                     List<TaskRespVO> taskList;
                     if (worker.getScenicOnly() != null) {
-                        taskList = taskMapper.selectNotRunningByScenicId(worker.getScenicOnly());
+                        taskList = taskMapper.selectNotRunningByScenicList(worker.getScenicOnly());
                     } else {
                         taskList = taskMapper.selectNotRunning();
                     }
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 92dfe70..3402425 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -82,7 +82,15 @@
     <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 and scenic_id not in (select scenic_only from render_worker where scenic_only is not null and status = 1)
+        where status = 0
+          and worker_id is null
+          and NOT EXISTS (
+            SELECT 1
+            FROM render_worker rw
+            WHERE
+                rw.status = 1
+              AND FIND_IN_SET(task.scenic_id, rw.scenic_only) > 0  -- 检查scenic_id是否在逗号分隔的字符串中
+        )
         limit 1
     </select>
     <select id="selectAllNotRunning" resultType="com.ycwl.basic.model.pc.task.entity.TaskEntity">
@@ -133,9 +141,10 @@
         from task
         where status = 2
     </select>
-    <select id="selectNotRunningByScenicId" resultType="com.ycwl.basic.model.pc.task.resp.TaskRespVO">
+    <select id="selectNotRunningByScenicList" 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}
+        where status = 0 and worker_id is null and FIND_IN_SET(scenic_id, #{scenicId})
+        limit 1
     </select>
 </mapper>