From cf235d38bb49fdf6e82a5ee9e98e97b8d9587662 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 23 Sep 2025 13:50:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=A8=A1=E6=9D=BF):=20=E4=B8=BA=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E6=89=BE=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?scanSource=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在findFirstAvailableTemplate方法中新增scanSource参数,用于控制模板生成时的来源检查逻辑。调用方TaskTaskServiceImpl在强制创建vlog时传入false以跳过来源检查。 --- src/main/java/com/ycwl/basic/biz/TemplateBiz.java | 4 ++-- .../com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ycwl/basic/biz/TemplateBiz.java b/src/main/java/com/ycwl/basic/biz/TemplateBiz.java index b523befe..11de4d0c 100644 --- a/src/main/java/com/ycwl/basic/biz/TemplateBiz.java +++ b/src/main/java/com/ycwl/basic/biz/TemplateBiz.java @@ -173,13 +173,13 @@ public class TemplateBiz { return filteredParams; } - public Long findFirstAvailableTemplate(List templateIds, Long faceId) { + public Long findFirstAvailableTemplate(List templateIds, Long faceId, boolean scanSource) { if (templateIds == null || templateIds.isEmpty() || faceId == null) { return null; } for (Long templateId : templateIds) { - if (determineTemplateCanGenerate(templateId, faceId)) { + if (determineTemplateCanGenerate(templateId, faceId, scanSource)) { return templateId; } } 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 3b340933..cff618c2 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 @@ -289,7 +289,7 @@ public class TaskTaskServiceImpl implements TaskService { templateList.forEach(template -> createTaskByFaceIdAndTemplateId(faceId, template.getId(), 1)); } else { if (Boolean.TRUE.equals(scenicConfig.getBoolean("force_create_vlog"))) { - Long availableTemplateId = templateBiz.findFirstAvailableTemplate(templateList.stream().map(TemplateRespVO::getId).toList(), faceId); + Long availableTemplateId = templateBiz.findFirstAvailableTemplate(templateList.stream().map(TemplateRespVO::getId).toList(), faceId, false); if (availableTemplateId != null) { createTaskByFaceIdAndTemplateId(faceId, availableTemplateId, 1); } else {