diff --git a/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java b/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java index 6978fc0f..90fb4c5b 100644 --- a/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java @@ -34,9 +34,9 @@ public class VideoEntity { */ private Long taskId; /** - * 执行任务的机器ID,render_worker.id + * 人脸ID,对应face.id */ - private Long workerId; + private Long faceId; /** * 视频链接 */ diff --git a/src/main/java/com/ycwl/basic/repository/VideoRepository.java b/src/main/java/com/ycwl/basic/repository/VideoRepository.java index c970cdf1..ec557d57 100644 --- a/src/main/java/com/ycwl/basic/repository/VideoRepository.java +++ b/src/main/java/com/ycwl/basic/repository/VideoRepository.java @@ -27,11 +27,6 @@ public class VideoRepository { public static final String VIDEO_CACHE_KEY = "video:%s"; public static final String VIDEO_BY_TASK_ID_CACHE_KEY = "video:task:%s"; @Autowired - @Lazy - private PriceBiz priceBiz; - @Autowired - private IVoucherService iVoucherService; - @Autowired private MemberRelationRepository memberRelationRepository; public VideoEntity getVideo(Long videoId) { 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 461db2ff..060d558a 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 @@ -492,7 +492,7 @@ public class TaskTaskServiceImpl implements TaskService { video.setScenicId(task.getScenicId()); video.setTemplateId(task.getTemplateId()); video.setTaskId(taskId); - video.setWorkerId(worker.getId()); + video.setFaceId(task.getFaceId()); video.setVideoUrl(task.getVideoUrl()); video.setCreateTime(new Date()); if (req.getVideoInfo() != null) { diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml index 7bacfd97..e912b1b7 100644 --- a/src/main/resources/mapper/VideoMapper.xml +++ b/src/main/resources/mapper/VideoMapper.xml @@ -2,8 +2,8 @@ - insert into video(id, scenic_id, template_id, task_id, worker_id, video_url, height, width, duration) - values (#{id}, #{scenicId}, #{templateId}, #{taskId}, #{workerId}, #{videoUrl}, #{height}, #{width}, #{duration}) + insert into video(id, scenic_id, template_id, task_id, face_id, video_url, height, width, duration) + values (#{id}, #{scenicId}, #{templateId}, #{taskId}, #{faceId}, #{videoUrl}, #{height}, #{width}, #{duration}) INSERT INTO member_video(member_id, scenic_id, face_id, template_id, task_id, video_id, is_buy, order_id) @@ -30,7 +30,7 @@ scenic_id = #{scenicId}, template_id = #{templateId}, task_id = #{taskId}, - worker_id = #{workerId}, + face_id = #{faceId}, video_url = #{videoUrl}, height = #{height}, width = #{width}, @@ -78,7 +78,7 @@ )