From 9877a5240feadb5447b969da0b9fcd0c6aa0d5d5 Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Thu, 5 Oct 2023 14:25:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUGFIX:=E5=8D=B0=E8=8A=B1=20overall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index fcfc32c1..3d957fee 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1397,8 +1397,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)); From 30ba1d1d7125ec8507b7fc95fb15ab88ac8b9b6d Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Thu, 5 Oct 2023 14:54:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUGFIX:=E4=BF=AE=E6=94=B9=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=92=8C=E4=BD=8D=E7=BD=AE=20=E4=BC=A0?= =?UTF-8?q?=E5=8F=82image=5Furl=20mask=5Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/DesignItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Date: Thu, 5 Oct 2023 15:09:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?designSingle=20=E6=96=B0=E5=A2=9E=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=9B=BE=E5=B1=82minio=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java | 4 ++++ .../da/service/impl/TDesignPythonOutfitDetailServiceImpl.java | 2 ++ 2 files changed, 6 insertions(+) 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/service/impl/TDesignPythonOutfitDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java index a8912f59..b813dc00 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -58,7 +58,9 @@ public class TDesignPythonOutfitDetailServiceImpl 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())){