模特比例修改、sketch拼贴

src/main/java/com/ai/da/controller/GenerateController.java

@@ -1,10 +1,7 @@
 package com.ai.da.controller;
 
 import com.ai.da.common.response.Response;
-import com.ai.da.model.dto.GenerateLikeDTO;
-import com.ai.da.model.dto.GenerateModifyDTO;
-import com.ai.da.model.dto.GenerateThroughImageTextDTO;
-import com.ai.da.model.dto.ImageToSketchDTO;
+import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.GenerateService;
 import io.swagger.annotations.Api;
@@ -12,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -87,7 +85,7 @@ public class GenerateController {
     @ApiOperation(value = "imageToSketch")
     @PostMapping("/imageToSketch")
     public Response<GenerateResultVO> imageToSketch(@Valid @RequestBody ImageToSketchDTO imageToSketchDTO) {
-        return Response.success(generateService.imageToSketch(imageToSketchDTO));
+        return Response.success(generateService.imageToSketch(imageToSketchDTO, null, null));
     }
 
     // modifySketch
@@ -97,27 +95,47 @@ public class GenerateController {
         return Response.success(generateService.modifySketch(generateModifyDTO));
     }
 
-    @ApiOperation(value = "请求poseTransform，异步获取结果")
-    @PostMapping("/poseTransform")
+    @ApiOperation(value = "请求进行姿势变换")
+    @GetMapping("/poseTransform")
     public Response<String> poseTransform(@ApiParam("projectId") @RequestParam Long projectId,
                                           @ApiParam("productImage") @RequestParam String productImage,
                                           @ApiParam("poseId") @RequestParam int poseId) {
         return Response.success(generateService.poseTransform(projectId, productImage, poseId));
     }
 
-    @ApiOperation(value = "获取pose transformation生成结果")
-    @PostMapping("/poseTransformResult")
+    @ApiOperation(value = "获取姿势变换生成结果")
+    @GetMapping("/poseTransformResult")
     public Response<PoseTransformationVO> getPoseTransformationResults(@ApiParam("taskId") @RequestParam String taskId) {
         PoseTransformationVO generateResult = generateService.getPoseTransformationResult(taskId);
         return Response.success(generateResult);
     }
 
-    public Response<String> modifyModelProportion(){
-        return null;
+    @ApiOperation(value = "修改模特比例")
+    @PostMapping("/modifyProportion")
+    public Response<String> modifyModelProportion(@Valid @RequestBody ModifyModelProportionDTO proportionDTO){
+        String path = generateService.modifyModelProportion(proportionDTO);
+        return Response.success(path);
     }
 
-    public Response<String> sketchReconstruction(){
-        return null;
+    @ApiOperation(value = "拼贴图生成线稿")
+    @PostMapping("/genSketchRecon")
+    public Response<GenerateResultVO> sketchReconstructionGenerate(@Valid @RequestBody SketchReconstructionDTO sketchReconstructionDTO){
+        GenerateResultVO generateResultVO = generateService.sketchReconstructionGenerate(sketchReconstructionDTO);
+        return Response.success(generateResultVO);
+    }
+
+    @ApiOperation(value = "拼贴图画布保存")
+    @GetMapping("/saveReconCanvas")
+    public Response<String> sketchReconstructionSave(@RequestParam("file") MultipartFile file, @RequestParam("projectId") Long projectId){
+        generateService.sketchReconstructionSave(file, projectId);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "获取拼贴图画布")
+    @GetMapping("/getReconCanvas")
+    public Response<SketchReconstructionVO> getSketchReconstruction(@RequestParam("projectId") Long projectId){
+        SketchReconstructionVO sketchReconstruction = generateService.getSketchReconstruction(projectId);
+        return Response.success(sketchReconstruction);
     }