Merge branch 'dev/dev_xp' into dev/dev
# Conflicts: # src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
This commit is contained in:
@@ -56,11 +56,10 @@ public interface GenerateService extends IService<Generate> {
|
||||
|
||||
void processPoseTransformResult(String taskId, String gifUrl, String videoUrl, String imageUrl);
|
||||
|
||||
List<PoseTransformationVO> getPoseTransformationResult(List<String> taskIdList);
|
||||
List<PoseTransformationVO> getPoseTransformationResult(List<String> taskIdList, Long projectId, Boolean like);
|
||||
|
||||
void updatePoseTransferStatus(String taskId, String status);
|
||||
|
||||
List<PoseTransformationVO> getPoseTransformationResultList(Long projectId, boolean like);
|
||||
|
||||
CollectionSort disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long sortLikeParentId);
|
||||
|
||||
|
||||
@@ -2063,8 +2063,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
||||
SketchReconstructionVO sketchReconstruction = generateService.getSketchReconstruction(projectDTO.getId());
|
||||
moduleChooseVO.setDeReconstruction(sketchReconstruction);
|
||||
}else if (module.equals(Module.poseTransfer.name())){
|
||||
List<PoseTransformationVO> likedList = generateService.getPoseTransformationResultList(projectDTO.getId(), true);
|
||||
List<PoseTransformationVO> list = generateService.getPoseTransformationResultList(projectDTO.getId(), false);
|
||||
List<PoseTransformationVO> likedList = generateService.getPoseTransformationResult(null, projectDTO.getId(), true);
|
||||
List<PoseTransformationVO> list = generateService.getPoseTransformationResult(null, projectDTO.getId(), false);
|
||||
PoseTransferVO vo = new PoseTransferVO();
|
||||
vo.setLikedList(likedList);
|
||||
vo.setList(list);
|
||||
|
||||
Reference in New Issue
Block a user