q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(模板): 为模板查找方法添加scanSource参数
All checks were successful
ZhenTu-BE/pipeline/head This commit looks good
Details

Browse Source 
在findFirstAvailableTemplate方法中新增scanSource参数，用于控制模板生成时的来源检查逻辑。调用方TaskTaskServiceImpl在强制创建vlog时传入false以跳过来源检查。
This commit is contained in:
Jerry Yan
2025-09-23 13:50:26 +08:00
parent 8903818cb0
commit cf235d38bb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ycwl/basic/biz/TemplateBiz.java
View File

@@ -173,13 +173,13 @@ public class TemplateBiz {
return filteredParams; return filteredParams;
} }
public Long findFirstAvailableTemplate(List<Long> templateIds, Long faceId) { public Long findFirstAvailableTemplate(List<Long> templateIds, Long faceId, boolean scanSource) {
if (templateIds == null || templateIds.isEmpty() || faceId == null) { if (templateIds == null || templateIds.isEmpty() || faceId == null) {
return null; return null;
} }
for (Long templateId : templateIds) { for (Long templateId : templateIds) {
if (determineTemplateCanGenerate(templateId, faceId)) { if (determineTemplateCanGenerate(templateId, faceId, scanSource)) {
return templateId; return templateId;
} }
} }

2
src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
View File

@@ -289,7 +289,7 @@ public class TaskTaskServiceImpl implements TaskService {
templateList.forEach(template -> createTaskByFaceIdAndTemplateId(faceId, template.getId(), 1)); templateList.forEach(template -> createTaskByFaceIdAndTemplateId(faceId, template.getId(), 1));
} else { } else {
if (Boolean.TRUE.equals(scenicConfig.getBoolean("force_create_vlog"))) { 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) { if (availableTemplateId != null) {
createTaskByFaceIdAndTemplateId(faceId, availableTemplateId, 1); createTaskByFaceIdAndTemplateId(faceId, availableTemplateId, 1);
} else { } else {