Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts:
#	src/main/java/com/ai/da/mapper/entity/SysFile.java

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

@@ -0,0 +1,21 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("编辑图层位置大小，合成图层")
+public class ComposeLayersVO {
+
+    @ApiModelProperty("designItemId")
+    private Long designItemId;
+
+    @ApiModelProperty("图层信息")
+    private List<DesignPythonOutfitVO> layers;
+
+    @ApiModelProperty("合成图")
+    private String designItemUrl;
+}

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

@@ -1,6 +1,6 @@
 package com.ai.da.model.vo;
 
-import com.ai.da.python.vo.DesignPythonItemPrint;
+import com.ai.da.model.dto.DesignSinglePrintDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,6 +11,9 @@ import java.util.List;
 @ApiModel("designItem detail clothes 响应")
 public class DesignItemClothesDetailVO {
 
+    /**
+     * designItemDetail对应的Id
+     */
     @ApiModelProperty("对应的上游id")
     private Long id;
 
@@ -20,15 +23,21 @@ public class DesignItemClothesDetailVO {
     @ApiModelProperty("上传时候对应的类型,一级类型 Moodboard Printboard  Sketchboard MarketingSketch Colorboard")
     private String level1Type;
 
-    @ApiModelProperty("对应的图片的绝对路径")
+    @ApiModelProperty("对应的图片路径")
     private String path;
 
+    @ApiModelProperty("对应图片minIO路径")
+    private String minIOPath;
+
     @ApiModelProperty(" 颜色 存 RGB值 中间空格分隔 比如 58 58 169")
 //    private String color;
     private PantoneVO color;
 
-    @ApiModelProperty("对应的print图片对象")
-    private DesignPythonItemPrint printObject;
+//    @ApiModelProperty("对应的print图片对象")
+//    private DesignPythonItemPrint printObject;
+
+    @ApiModelProperty("print详细")
+    private DesignSinglePrintDTO printObject = new DesignSinglePrintDTO();
 
     @ApiModelProperty("对应图层信息")
     private List<DesignPythonOutfitVO> layersObject;

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

@@ -17,9 +17,12 @@ public class DesignItemOthersDetailVO {
     @ApiModelProperty("对应的类型 有Hairstyle Earring Body")
     private String type;
 
-    @ApiModelProperty("对应的图片的绝对路径")
+    @ApiModelProperty("对应的图片路径")
     private String path;
 
+    @ApiModelProperty("对应图片minIO路径")
+    private String minIOPath;
+
     @ApiModelProperty(" 颜色 存 RGB值 中间空格分隔 比如 58 58 169")
 //    private String color;
     private PantoneVO color;

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

@@ -42,4 +42,9 @@ public class DesignPythonOutfitVO {
      */
     @ApiModelProperty(value = "位置")
     private List<Long> position;
+    /**
+     * 图层缩放比例
+     */
+    @ApiModelProperty(value = "缩放比例")
+    private Float scale = 1.0f;
 }

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

@@ -12,20 +12,41 @@ import java.util.List;
 @ApiModel("design single 印花详情")
 public class DesignSinglePrint {
 
+    @ApiModelProperty("印花url")
+    private String path;
+
+    @ApiModelProperty("印花minIO路径")
+    private String minIOPath;
+
     @ApiModelProperty("印花位置")
-    @Range(max = 1L,message = "印花坐标需用大于等于0小于等于1的数表示")
-    private List<Float> location;
+    private List<Double> location;
 
     @ApiModelProperty("印花大小")
     @Range(max = 1,message = "印花缩放值需用大于等于0小于等于1的数表示")
-    private Float scale;
+    private Double scale;
 
     @Range(min = -360,max = 360,message = "印花旋转角度范围为-360° ~ 360°")
     @ApiModelProperty("印花角度")
-    private Float angle;
+    private Double angle;
 
     @Min(value = 1)
     @ApiModelProperty("印花优先级")
     private Integer priority;
 
+    public DesignSinglePrint() {
+    }
+
+    public DesignSinglePrint(String path, Double scale) {
+        this.path = path;
+        this.scale = scale;
+    }
+
+    public DesignSinglePrint(String path, String minIOPath, List<Double> location, Double scale, Double angle, Integer priority) {
+        this.path = path;
+        this.minIOPath = minIOPath;
+        this.location = location;
+        this.scale = scale;
+        this.angle = angle;
+        this.priority = priority;
+    }
 }

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

@@ -8,11 +8,10 @@ import java.util.List;
 @Data
 public class DesignSingleVO {
 
+    @ApiModelProperty("designItemId")
     private Long designItemId;
 
-    /**
-     * 全身图
-     */
+    @ApiModelProperty("全身图")
     private String designItemUrl;
 
 

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

@@ -0,0 +1,15 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("编辑图层的位置、大小")
+public class EditLayersPositionAndScaleVO {
+    @ApiModelProperty("layers")
+    private ComposeLayersVO layers;
+
+    @ApiModelProperty("时区")
+    private String timeZone;
+}