逻辑修正

This commit is contained in:
2025-03-04 16:18:31 +08:00
parent f0b8d85dcc
commit ff39208d80
2 changed files with 21 additions and 15 deletions

View File

@ -386,14 +386,13 @@ public class TaskTaskServiceImpl implements TaskService {
if (faceSampleList.isEmpty()) {
log.info("faceId:{} sample list not exist", faceId);
}
if (automatic == 1) {
if (templateBiz.determineTemplateCanGenerate(templateId, faceId, false)) {
// 临时写死,当自动生成视频,切片也算合成中,并更新状态
taskStatusBiz.setFaceCutStatus(face.getId(), 0);
}
if (templateBiz.determineTemplateCanGenerate(templateId, faceId, false)) {
// 临时写死,当自动生成视频,切片也算合成中,并更新状态
taskStatusBiz.setFaceCutStatus(face.getId(), 0);
} else {
taskStatusBiz.setFaceCutStatus(face.getId(), 2);
}
List<Long> faceSampleIds = faceSampleList.stream().map(FaceSampleEntity::getId).collect(Collectors.toList());
List<SourceEntity> sourceList = sourceMapper.listVideoByScenicFaceRelation(face.getScenicId(), faceId);
// ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(face.getScenicId());
// if (automatic > 0) {
// TaskReqQuery taskReqQuery = new TaskReqQuery();
@ -434,7 +433,7 @@ public class TaskTaskServiceImpl implements TaskService {
task.templateId = templateId;
task.memberId = face.getMemberId();
task.callback = () -> {
log.info("task callback");
log.info("task callback: {}", task);
boolean canGenerate = templateBiz.determineTemplateCanGenerate(templateId, faceId);
if (!canGenerate) {
log.info("task callback: 不能生成,templateId: {}", templateId);
@ -529,10 +528,7 @@ public class TaskTaskServiceImpl implements TaskService {
};
if (faceSampleIds.isEmpty()) {
// 没有人脸样本
if (!sourceList.isEmpty()) {
// 但是有原片
task.callback.onInvoke();
}
task.callback.onInvoke();
} else {
VideoPieceGetter.addTask(task);
}