diff --git a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java index 42e4dae0..de512ad9 100644 --- a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java @@ -32,11 +32,15 @@ public class DesignPythonOutfitVO { */ @ApiModelProperty(value = "对应的图片的绝对路径") private String imageUrl; + + private String imageMinioUrl; /** * mask_url */ @ApiModelProperty(value = "遮罩") private String maskUrl; + + private String maskMinioUrl; /** * 位置 */ diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 1526ed2d..a710cd93 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1396,8 +1396,12 @@ public class PythonService { List prints = printObject.getPrints(); prints.forEach(p -> { if (printObject.getIfSingle().equals(Boolean.FALSE)){ + p.getLocation().set(0,p.getLocation().get(0)); + p.getLocation().set(1,p.getLocation().get(1)); scale.add(p.getScale()); - paths.add(p.getPath()); + paths.add(p.getMinIOPath()); + location.add(p.getLocation()); + angle.add(p.getAngle()); }else { p.getLocation().set(0,p.getLocation().get(0)); p.getLocation().set(1,p.getLocation().get(1)); 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 fd072fec..388c0c50 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -459,8 +459,8 @@ public class DesignItemServiceImpl extends ServiceImpl) JSON.parse(detail.getPosition())); // 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())){