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 listEntity(TaskReqQuery taskReqQuery); - List selectNotRunningByScenicId(Long scenicOnly); + List 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 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, 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