Merge branch 'dev/dev_xp' into dev/3.1_release_merge

This commit is contained in:
2026-02-02 13:32:55 +08:00
3 changed files with 11 additions and 6 deletions

View File

@@ -149,7 +149,7 @@ public class GenerateController {
@Operation(summary = "获取pose transfer的所有pose")
@GetMapping("/getAllPose")
public Response<List<Map<String, String>>> getAllPose(){
public Response<List<Map<String, Object>>> getAllPose(){
return Response.success(generateService.getAllPose());
}

View File

@@ -73,7 +73,7 @@ public interface GenerateService extends IService<Generate> {
SketchReconstructionVO getSketchReconstruction(Long projectId);
List<Map<String, String>> getAllPose();
List<Map<String, Object>> getAllPose();
void processPoseTransformResultBatch(String taskId, String gifUrl, String videoUrl, String imageUrl, String progress);

View File

@@ -3090,14 +3090,19 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
return vo;
}
public List<Map<String, String>> getAllPose() {
public List<Map<String, Object>> getAllPose() {
List<Map<String, String>> propertyList = PoseEnum.getPropertyList();
List<Map<String, Object>> resp = new ArrayList<>();
propertyList.forEach(item -> {
HashMap<String, Object> temp = new HashMap<>();
// item.put("gif", minioUtil.getPreSignedUrl(item.get("gif"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
item.put("video", minioUtil.getPreSignedUrl(item.get("video"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
item.put("firstFrame", minioUtil.getPreSignedUrl(item.get("firstFrame"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
temp.put("id", Integer.parseInt(item.get("id")));
temp.put("video", minioUtil.getPreSignedUrl(item.get("video"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
temp.put("firstFrame", minioUtil.getPreSignedUrl(item.get("firstFrame"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
resp.add(temp);
});
return propertyList;
return resp;
}
@Override