diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java index fcb4f920..1b2f0e50 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; @Data public class DesignSingleItemDTO { @@ -26,4 +27,10 @@ public class DesignSingleItemDTO { @ApiModelProperty("对应的print图片对象") // private DesignPythonItemPrint printObject; private DesignSinglePrintDTO printObject; + + @ApiModelProperty("图层位置") + private List offset; + + @ApiModelProperty("图层缩放比例") + private Float scale; } diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 3f7060bf..9ee180de 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1348,7 +1348,9 @@ public class PythonService { "none", // todo businessId 待确认 designSingleItem.getId(), - pythonTAllInfoService.getImageIdByPath(designSingleItem.getPath()))); + pythonTAllInfoService.getImageIdByPath(designSingleItem.getPath()), + designSingleItem.getOffset(), + designSingleItem.getScale())); }); diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java index 4e207cef..5b260a0a 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java @@ -61,6 +61,14 @@ public class DesignPythonItem { * url在t_sys_file中的id */ private Long image_id; + /** + * 图层偏移量(位置) + */ + private List offset; + /** + * 图层缩放大小 + */ + private Float resize_scale; public static List OUTWEAR_DRESS_BLOUSE = Arrays.asList(CollectionLevel2TypeEnum.OUTWEAR.getRealName(), @@ -86,6 +94,18 @@ public class DesignPythonItem { this.image_id = image_id; } + public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, String icon, Long businessId, Long image_id, List offset, Float resize_scale) { + this.type = type; + this.path = path; + this.color = color; + this.print = print; + this.icon = icon; + this.businessId = businessId; + this.image_id = image_id; + this.offset = offset; + this.resize_scale = resize_scale; + } + public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, String icon, Long businessId, Long image_id) { this.type = type; this.path = path; diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 43cbc151..ac30fa12 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -354,7 +354,7 @@ public class DesignItemServiceImpl extends ServiceImpl) JSON.parse(detail.getPosition())); -// designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); + designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getImageUrl(),480)); designPythonOutfitVO.setImageMinioUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : detail.getImageUrl()); designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getMaskUrl(),480)); designPythonOutfitVO.setMaskMinioUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : detail.getMaskUrl()); designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale())); - if (!StringUtil.isNullOrEmpty(detail.getImageSize())){ + /*if (!StringUtil.isNullOrEmpty(detail.getImageSize())){ List size = Arrays.stream(detail.getImageSize().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); ArrayList imageSize = new ArrayList<>(); for (Long aLong : size) { imageSize.add((long) (aLong * Float.parseFloat(detail.getScale()))); } designPythonOutfitVO.setImageSize(imageSize); - } + }*/ return designPythonOutfitVO; }