diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java index dbd95b6..196ee6d 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java @@ -232,7 +232,7 @@ public class AppScenicServiceImpl implements AppScenicService { @Override public ApiResponse> contentListUseDefaultFace() { FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(BaseContextHandler.getUserId()); - return contentList(lastFaceByUserId.getId()); + return faceContentList(lastFaceByUserId.getMemberId(), lastFaceByUserId.getId()); } @Override diff --git a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java index bce6cff..2647a93 100644 --- a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java @@ -251,27 +251,29 @@ public class TaskTaskServiceImpl implements TaskService { taskReqQuery.setFaceId(faceId); taskReqQuery.setTemplateId(templateId); List list = taskMapper.list(taskReqQuery); - list.parallelStream().forEach(task -> { - MemberVideoEntity memberVideo = videoMapper.queryRelationByMemberTask(faceRespVO.getMemberId(), task.getId()); - if (memberVideo == null) { - memberVideo = new MemberVideoEntity(); - memberVideo.setMemberId(faceRespVO.getMemberId()); - memberVideo.setScenicId(task.getScenicId()); - memberVideo.setFaceId(faceId); - memberVideo.setTemplateId(task.getTemplateId()); - memberVideo.setIsBuy(0); - memberVideo.setTaskId(task.getId()); - VideoEntity video = videoMapper.findByTaskId(task.getId()); - if (video != null) { - memberVideo.setVideoId(video.getId()); + if (!list.isEmpty()) { + list.parallelStream().forEach(task -> { + MemberVideoEntity memberVideo = videoMapper.queryRelationByMemberTask(faceRespVO.getMemberId(), task.getId()); + if (memberVideo == null) { + memberVideo = new MemberVideoEntity(); + memberVideo.setMemberId(faceRespVO.getMemberId()); + memberVideo.setScenicId(task.getScenicId()); + memberVideo.setFaceId(faceId); + memberVideo.setTemplateId(task.getTemplateId()); + memberVideo.setIsBuy(0); + memberVideo.setTaskId(task.getId()); + VideoEntity video = videoMapper.findByTaskId(task.getId()); + if (video != null) { + memberVideo.setVideoId(video.getId()); + } + videoMapper.addRelation(memberVideo); + new Thread(() -> { + sendVideoGeneratedServiceNotification(list.get(0).getId(), faceRespVO.getMemberId()); + }).start(); } - videoMapper.addRelation(memberVideo); - new Thread(() -> { - sendVideoGeneratedServiceNotification(list.get(0).getId(), faceRespVO.getMemberId()); - }).start(); - } - }); - return; + }); + return; + } } VideoPieceGetter.Task task = new VideoPieceGetter.Task(); task.faceId = faceId;