Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java

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

@@ -0,0 +1,43 @@
+package com.ai.da.controller;
+
+import com.ai.da.model.dto.BasicEmailParamDTO;
+import com.ai.da.service.EmailService;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thymeleaf.context.Context;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+
+@Api(tags = "邮件模块")
+@Slf4j
+@RestController
+@RequestMapping("/api/email")
+public class EmailController {
+
+    @Resource
+    private EmailService emailService;
+
+    @GetMapping("/loadSingleTemplate")
+    public void loadSingleEmailTemplate(){
+        emailService.loadSingleEmailTemplate("templates\\upgrade\\122899_AiDA发版完成通知中文版.html");
+    }
+
+    @GetMapping("/loadTemplate")
+    public void loadTemplatesFromResources(){
+        emailService.loadTemplatesFromResources("templates");
+    }
+
+    @GetMapping("/sendEmailTest")
+    public void sendEmailTest(){
+        Context context = new Context();
+        context.setVariable("username", "小白");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("username", "小白");
+        emailService.sendEmail(Collections.singletonList("xupei3360@163.com"), jsonObject, "132124_affiliate_accepted_en.html", "测试邮件", null, null );
+    }
+}

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,11 +9,11 @@ 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;
 import java.util.List;
-
 /**
  * @author XP
  */
@@ -88,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
@@ -98,4 +95,50 @@ public class GenerateController {
         return Response.success(generateService.modifySketch(generateModifyDTO));
     }
 
+    @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 = "获取姿势变换生成结果")
+    @GetMapping("/poseTransformResult")
+    public Response<PoseTransformationVO> getPoseTransformationResults(@ApiParam("taskId") @RequestParam String taskId) {
+        PoseTransformationVO generateResult = generateService.getPoseTransformationResult(taskId);
+        return Response.success(generateResult);
+    }
+
+    @ApiOperation(value = "修改模特比例")
+    @PostMapping("/modifyProportion")
+    public Response<String> modifyModelProportion(@Valid @RequestBody ModifyModelProportionDTO proportionDTO){
+        String path = generateService.modifyModelProportion(proportionDTO);
+        return Response.success(path);
+    }
+
+    @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);
+    }
+
+
+
+
 }