Merge branch 'dev/dev_xp' into dev/dev

This commit is contained in:
2025-04-09 09:48:51 +08:00
3 changed files with 10 additions and 5 deletions

View File

@@ -14,6 +14,8 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author XP * @author XP
*/ */
@@ -139,7 +141,7 @@ public class GenerateController {
@ApiOperation(value = "获取pose transfer的所有pose") @ApiOperation(value = "获取pose transfer的所有pose")
@GetMapping("/getAllPose") @GetMapping("/getAllPose")
public Response<List<String>> getAllPose(){ public Response<List<Map<String, String>>> getAllPose(){
return Response.success(generateService.getAllPose()); return Response.success(generateService.getAllPose());
} }

View File

@@ -62,5 +62,5 @@ public interface GenerateService extends IService<Generate> {
SketchReconstructionVO getSketchReconstruction(Long projectId); SketchReconstructionVO getSketchReconstruction(Long projectId);
List<String> getAllPose(); List<Map<String, String>> getAllPose();
} }

View File

@@ -1193,10 +1193,13 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
return vo; return vo;
} }
public List<String> getAllPose(){ public List<Map<String, String>> getAllPose(){
String posePath = "aida-sys-image/pose/pose-1.gif"; String posePath = "aida-sys-image/pose/pose-1.gif";
String preSignedUrl = minioUtil.getPreSignedUrl(posePath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME); String firstFramePath = "aida-sys-image/pose/pose-1-first_frame.jpeg";
return Arrays.asList(preSignedUrl); HashMap<String, String> resp = new HashMap<>();
resp.put("gif", minioUtil.getPreSignedUrl(posePath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
resp.put("firstFrame", minioUtil.getPreSignedUrl(firstFramePath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
return Arrays.asList(resp);
} }
} }