From 37be3a17590f07c94592aabd360a32a6f6e94cff Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 25 Feb 2025 15:22:14 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B1=80=E9=83=A8design=20=E6=9C=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=89=8D=EF=BC=8C=E4=B8=8D=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=BE=202=E3=80=81=E6=89=93=E5=BC=80=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=89=87=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/common/constant/CommonConstant.java   |  2 ++
 .../da/service/impl/DesignItemServiceImpl.java  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java
index 708bb2e5..b5dabb24 100644
--- a/src/main/java/com/ai/da/common/constant/CommonConstant.java
+++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java
@@ -83,5 +83,7 @@ public class CommonConstant {
 
     public static final String PARTIAL_DESIGN_FILENAME = "PartialDesign";
 
+    public static final String PARTIAL_DESIGN_PREVIEW_FILENAME = "Preview";
+
 
 }
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 bf2656ed..42797e5d 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -509,15 +509,15 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         // 将标注后的mask上传到minio,并将minio地址传给python端
         // todo 如果当前design使用的仍是旧的mask 则置maskUrl为null
         // 1、查询当前design item在不在history中
-/*        UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId());
+        UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId());
         Boolean setNull = Boolean.FALSE;
         if (!Objects.isNull(userLikeDesign) && userLikeDesign.getConverted() == 0){
             setNull = Boolean.TRUE;
-        }*/
-//        maskBase64ToPath(designSingleIncludeLayersDTO, setNull);
-        maskBase64ToPath(designSingleIncludeLayersDTO, Boolean.TRUE);
+        }
+        maskBase64ToPath(designSingleIncludeLayersDTO, setNull);
+//        maskBase64ToPath(designSingleIncludeLayersDTO, Boolean.TRUE);
 
-        partialDesignBase64ToImage(designSingleIncludeLayersDTO, userId);
+        partialDesignBase64ToImage(designSingleIncludeLayersDTO, userId, designSingleIncludeLayersDTO.getIsPreview());
 
         // 组装入参
         DesignPythonObjects objects = pythonService.covertDesignSingleParam(
@@ -626,19 +626,20 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         });
     }
 
-    private void partialDesignBase64ToImage(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, Long accountId){
+    private void partialDesignBase64ToImage(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, Long accountId, boolean preview){
         designSingleIncludeLayersDTO.getDesignSingleItemDTOList().forEach(item -> {
             PartialDesignDTO partialDesignDTO = item.getPartialDesign();
             if (!Objects.isNull(item.getPartialDesign())
                     && !StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignBase64())){
                 String path ;
-                if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath())){
+                if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath()) && !preview){
                     String sourcePath = partialDesignDTO.getPartialDesignMinioPath();
                     path = sourcePath.substring(sourcePath.indexOf("/") + 1, sourcePath.lastIndexOf("."));
+                }else if (preview){
+                    path = accountId + "/" + CommonConstant.PARTIAL_DESIGN_PREVIEW_FILENAME + "/" + UUID.randomUUID();
                 }else {
                     path = accountId + "/" + CommonConstant.PARTIAL_DESIGN_FILENAME + "/" + UUID.randomUUID();
                 }
-                // todo 将原图地址作为修改后的图片地址，放在不同的桶
                 String newPath = minioUtil.base64UploadToPath(partialDesignDTO.getPartialDesignBase64(), partialDesignBucket, path);
                 if (StringUtil.isNullOrEmpty(newPath)){
                     log.error("局部design图片上传失败");