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

fix(task): 修改任务创建接口中的自动标志参数类型

Browse Source 
- 将 createTaskByFaceIdAndTemplateId 方法的 automatic 参数从 int 改为 boolean
- 更新方法实现以适配新的布尔值参数
- 移除无用的导入类和未使用的代码
- 调整任务实体中 automatic 字段的赋值逻辑以匹配新类型
- 删除已弃用的旧版重载方法
- 确保所有调用点传递正确的布尔值而非整数
- 优化代码结构并提高可读性
This commit is contained in:
Jerry Yan
2025-12-13 19:19:21 +08:00
parent 3f6f1508c5
commit af131131ed
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java
View File

@@ -55,7 +55,7 @@ public class AppTaskController {
@PostMapping("/submit")
public ApiResponse<String> submitVideoTask(@RequestBody VideoTaskReq videoTaskReq) {
taskService.createTaskByFaceIdAndTemplateId(videoTaskReq.getFaceId(),videoTaskReq.getTemplateId(),0);
taskService.createTaskByFaceIdAndTemplateId(videoTaskReq.getFaceId(),videoTaskReq.getTemplateId(),false);
return ApiResponse.success("成功");
}
}

4
src/main/java/com/ycwl/basic/service/task/TaskService.java
View File

@@ -14,9 +14,7 @@ public interface TaskService {
TemplateRespVO workerGetTemplate(Long templateId, WorkerAuthReqVo req);
void createTaskByFaceIdAndTemplateId(Long faceId, Long templateId);
void createTaskByFaceIdAndTemplateId(Long faceId, Long templateId, int automatic);
void createTaskByFaceIdAndTemplateId(Long faceId, Long templateId, boolean automatic);
void taskSuccess(Long taskId, TaskSuccessReqVo req);

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

@@ -22,7 +22,6 @@ import com.ycwl.basic.mapper.TaskMapper;
import com.ycwl.basic.mapper.VideoMapper;
import com.ycwl.basic.model.mobile.order.IsBuyRespVO;
import com.ycwl.basic.model.pc.face.entity.FaceEntity;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
import com.ycwl.basic.model.pc.mp.MpConfigEntity;
@@ -67,7 +66,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -256,7 +254,7 @@ public class TaskTaskServiceImpl implements TaskService {
@Override
public void forceCreateTaskByFaceIdAndTempalteId(Long faceId, Long templateId) {
createTaskByFaceIdAndTemplateIdInternal(faceId, templateId, 0, true);
createTaskByFaceIdAndTemplateIdInternal(faceId, templateId, false, true);
}
@Override
@@ -304,34 +302,30 @@ public class TaskTaskServiceImpl implements TaskService {
}
if (Integer.valueOf(3).equals(scenicConfig.getInteger("book_routine")) || Integer.valueOf(4).equals(scenicConfig.getInteger("book_routine"))) {
// 生成全部视频的逻辑
templateList.forEach(template -> createTaskByFaceIdAndTemplateId(faceId, template.getId(), 1));
templateList.forEach(template -> createTaskByFaceIdAndTemplateId(faceId, template.getId(), true));
} else {
if (Boolean.TRUE.equals(scenicConfig.getBoolean("force_create_vlog"))) {
Long availableTemplateId = templateBiz.findFirstAvailableTemplate(templateList.stream().map(TemplateRespVO::getId).toList(), faceId, false);
if (availableTemplateId != null) {
createTaskByFaceIdAndTemplateId(faceId, availableTemplateId, 1);
createTaskByFaceIdAndTemplateId(faceId, availableTemplateId, true);
} else {
log.info("faceId:{} available template is not exist", faceId);
}
} else {
// 非强制创建，只创建第一个可用模板
if (!templateList.isEmpty()) {
createTaskByFaceIdAndTemplateId(faceId, templateList.getFirst().getId(), 1);
createTaskByFaceIdAndTemplateId(faceId, templateList.getFirst().getId(), true);
}
}
}
}
@Override
public void createTaskByFaceIdAndTemplateId(Long faceId, Long templateId) {
createTaskByFaceIdAndTemplateId(faceId, templateId, 0);
}
@Override
public void createTaskByFaceIdAndTemplateId(Long faceId, Long templateId, int automatic) {
public void createTaskByFaceIdAndTemplateId(Long faceId, Long templateId, boolean automatic) {
createTaskByFaceIdAndTemplateIdInternal(faceId, templateId, automatic, false);
}
private void createTaskByFaceIdAndTemplateIdInternal(Long faceId, Long templateId, int automatic, boolean forceCreate) {
private void createTaskByFaceIdAndTemplateIdInternal(Long faceId, Long templateId, boolean automatic, boolean forceCreate) {
FaceEntity face = faceRepository.getFace(faceId);
if (face == null) {
log.info("faceId:{} is not exist", faceId);
@@ -430,7 +424,7 @@ public class TaskTaskServiceImpl implements TaskService {
taskEntity.setScenicId(face.getScenicId());
taskEntity.setFaceId(faceId);
taskEntity.setTemplateId(templateId);
taskEntity.setAutomatic(automatic);
taskEntity.setAutomatic(automatic ? 1 : 0);
}
taskEntity.setWorkerId(null);
taskEntity.setStatus(0);