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 b45cee00..0c839ea0 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 @@ -399,7 +399,7 @@ public class TaskTaskServiceImpl implements TaskService { memberVideoEntity.setTemplateId(templateId); memberVideoEntity.setIsBuy(0); if (list.isEmpty()) { - log.info("创建任务! faceId:{},templateId:{},taskParams:{}", faceId, templateId, sourcesMap); + log.info("创建任务! faceId:{},templateId:{}", faceId, templateId); ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(face.getScenicId()); TaskEntity taskEntity = null; boolean isReuseOldTask = false; @@ -439,15 +439,16 @@ public class TaskTaskServiceImpl implements TaskService { } memberVideoEntity.setTaskId(taskEntity.getId()); } else { - log.info("重复task,更新旧任务! faceId:{},templateId:{},taskParams:{}", faceId, templateId, sourcesMap); TaskRespVO existingTask = list.getFirst(); - // 更新旧任务:重置workerId为空,status为0,更新taskParams + log.info("重复task,更新旧任务! faceId:{},templateId:{},taskId:{}", faceId, templateId, existingTask.getId()); + // 更新旧任务:重置status为0,更新taskParams TaskEntity taskUpdate = new TaskEntity(); taskUpdate.setId(existingTask.getId()); - taskUpdate.setWorkerId(null); taskUpdate.setStatus(0); taskUpdate.setTaskParams(JacksonUtil.toJSONString(sourcesMap)); taskMapper.update(taskUpdate); + // 显式清除workerId(update方法的动态SQL会跳过null值) + taskMapper.deassign(existingTask.getId()); videoTaskRepository.clearTaskCache(existingTask.getId()); memberVideoEntity.setTaskId(existingTask.getId()); diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml index 5fdf4f82..d6c48cc2 100644 --- a/src/main/resources/mapper/TaskMapper.xml +++ b/src/main/resources/mapper/TaskMapper.xml @@ -15,7 +15,7 @@ scenic_id = #{scenicId}, task_params = #{taskParams}, video_url = #{videoUrl}, - status = #{status}, + `status` = #{status}, result = #{result}, where id = #{id}