aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
This commit is contained in:
xupei
2025-07-15 12:10:55 +08:00
parent f4b22fe874 f551ba452f
commit 0beec5392e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/controller/GenerateController.java
View File

@@ -109,7 +109,7 @@ public class GenerateController {
@ApiOperation(value = "获取姿势变换生成结果") @ApiOperation(value = "获取姿势变换生成结果")
@PostMapping("/poseTransformResult") @PostMapping("/poseTransformResult")
public Response<List<PoseTransformationVO>> getPoseTransformationResults(@Valid @RequestBody List<String> taskIdList) { public Response<List<PoseTransformationVO>> getPoseTransformationResults(@Valid @RequestBody List<String> taskIdList) {
List<PoseTransformationVO> generateResult = generateService.getPoseTransformationResult(taskIdList); List<PoseTransformationVO> generateResult = generateService.getPoseTransformationResult(taskIdList, null, null);
return Response.success(generateResult); return Response.success(generateResult);
} }

3
src/main/java/com/ai/da/service/GenerateService.java
View File

@@ -56,11 +56,10 @@ public interface GenerateService extends IService<Generate> {
void processPoseTransformResult(String taskId, String gifUrl, String videoUrl, String imageUrl); 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); void updatePoseTransferStatus(String taskId, String status);
List<PoseTransformationVO> getPoseTransformationResultList(Long projectId, boolean like);
CollectionSort disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long sortLikeParentId); CollectionSort disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long sortLikeParentId);

4
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -2063,8 +2063,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
SketchReconstructionVO sketchReconstruction = generateService.getSketchReconstruction(projectDTO.getId()); SketchReconstructionVO sketchReconstruction = generateService.getSketchReconstruction(projectDTO.getId());
moduleChooseVO.setDeReconstruction(sketchReconstruction); moduleChooseVO.setDeReconstruction(sketchReconstruction);
}else if (module.equals(Module.poseTransfer.name())){ }else if (module.equals(Module.poseTransfer.name())){
List<PoseTransformationVO> likedList = generateService.getPoseTransformationResultList(projectDTO.getId(), true); List<PoseTransformationVO> likedList = generateService.getPoseTransformationResult(null, projectDTO.getId(), true);
List<PoseTransformationVO> list = generateService.getPoseTransformationResultList(projectDTO.getId(), false); List<PoseTransformationVO> list = generateService.getPoseTransformationResult(null, projectDTO.getId(), false);
PoseTransferVO vo = new PoseTransferVO(); PoseTransferVO vo = new PoseTransferVO();
vo.setLikedList(likedList); vo.setLikedList(likedList);
vo.setList(list); vo.setList(list);