Merge branch 'dev/dev_xp' into dev/dev

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

src/main/java/com/ai/da/model/dto/BasicEmailParamDTO.java

@@ -0,0 +1,29 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+import javax.mail.internet.InternetAddress;
+
+@Data
+public class BasicEmailParamDTO {
+    /** 邮箱服务器 */
+    private String serviceAddress;
+    /** 邮箱服务器端口 */
+    private String servicePort;
+    /** 发件人邮箱地址 */
+    private String senderUserMail;
+    /** 发件人账号 */
+    private String senderUser;
+    /** 发件人密码 */
+    private String password;
+    /** 邮件标题 */
+    private String subject;
+    /** 邮件内容 */
+    private String content;
+    /** 收件人邮箱地址 */
+    private InternetAddress[] mailTo;
+    /** 抄送人 */
+    private InternetAddress[] cc;
+    /** 暗抄送人 */
+    private InternetAddress[] bcc;
+}

src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java

@@ -19,4 +19,13 @@ public class ImageToSketchDTO {
 
     @ApiModelProperty("性别")
     private String gender;
+
+    public ImageToSketchDTO() {
+    }
+
+    public ImageToSketchDTO(Long elementId, String style, String gender) {
+        this.elementId = elementId;
+        this.style = style;
+        this.gender = gender;
+    }
 }

src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java

@@ -0,0 +1,68 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("ModifyModelProportionDTO")
+public class ModifyModelProportionDTO {
+    @ApiModelProperty("模特id")
+    @NotNull(message = "model id cannot be empty")
+    private Long id;
+
+    @ApiModelProperty("Library || System")
+    @NotBlank(message = "model type cannot be empty")
+    private String type;
+
+    @ApiModelProperty("top")
+    @NotNull(message = "top cannot be empty")
+    private Integer top;
+
+    @ApiModelProperty("bottom")
+    @NotNull(message = "bottom cannot be empty")
+    private Integer bottom;
+
+    @ApiModelProperty("stretch")
+    @NotNull(message = "stretch cannot be empty")
+    private Float stretch;
+
+    @ApiModelProperty("模特minio地址")
+    @NotBlank(message = "modelPath type cannot be empty")
+    private String modelPath;
+
+    @NotNull(message = "handLeft cannot be null")
+    @NotEmpty(message = "handLeft cannot be empty")
+    @ApiModelProperty("handLeft")
+    private Float[] handLeft;
+
+    @NotNull(message = "handRight cannot be null")
+    @NotEmpty(message = "handRight cannot be empty")
+    @ApiModelProperty("handRight")
+    private Float[] handRight;
+
+    @NotNull(message = "shoulderLeft cannot be null")
+    @NotEmpty(message = "shoulderLeft cannot be empty")
+    @ApiModelProperty("shoulderLeft")
+    private Float[] shoulderLeft;
+
+    @NotNull(message = "shoulderRight cannot be null")
+    @NotEmpty(message = "shoulderRight cannot be empty")
+    @ApiModelProperty("shoulderRight")
+    private Float[] shoulderRight;
+
+    @NotNull(message = "waistbandLeft cannot be null")
+    @NotEmpty(message = "waistbandLeft cannot be empty")
+    @ApiModelProperty("waistbandLeft")
+    private Float[] waistbandLeft;
+
+    @NotNull(message = "waistbandRight cannot be null")
+    @NotEmpty(message = "waistbandRight cannot be empty")
+    @ApiModelProperty("waistbandRight")
+    private Float[] waistbandRight;
+
+}

src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java

@@ -0,0 +1,19 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "sketch拼贴")
+public class SketchReconstructionDTO {
+
+    @ApiModelProperty("项目id")
+    private Long projectId;
+
+    @ApiModelProperty("拼贴图的base64数据")
+    private String collagePicture;
+    // 识别衣服类型用
+    @ApiModelProperty("性别")
+    private String gender;
+}

src/main/java/com/ai/da/model/vo/PoseTransformationVO.java

@@ -0,0 +1,25 @@
+package com.ai.da.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PoseTransformationVO {
+
+    private Long id;
+
+    private String taskId;
+
+    private String gifUrl;
+
+    private String videoUrl;
+    // GIF第一帧截图
+    private String imageUrl;
+
+    private byte isLiked;
+
+    private String status;
+}

src/main/java/com/ai/da/model/vo/SketchReconstructionVO.java

@@ -0,0 +1,15 @@
+package com.ai.da.model.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+@Data
+public class SketchReconstructionVO {
+
+    private JSONObject canvasFile;
+
+    private String collageSketchUrl;
+
+    private boolean isLiked;
+
+}