From 29bf172187dca47a1f6f048e0c5b987c149dee40 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 15 Oct 2024 10:30:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89mask=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/python/PythonService.java         | 8 ++++++--
 .../com/ai/da/service/impl/DesignItemServiceImpl.java     | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index 55d28425..d7f96b68 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -2670,7 +2670,10 @@ public class PythonService {
                     designSingleItem.getPriority(),
                     minioPath,
                     gradientString,
-                    designSingleItem.getMaskUrl()));
+                    /*designSingleItem.getMaskUrl()*/
+                    null
+            ));
+
         });
 
 
@@ -2834,7 +2837,8 @@ public class PythonService {
         basic.setScale_earrings(0.16);
         basic.setBody_point_test(getMap(designLibraryModelPoint));
         basic.setLayer_order(Boolean.TRUE);
-        basic.setPreview_submit(previewOrSubmit);
+//        basic.setPreview_submit(previewOrSubmit);
+        basic.setPreview_submit(null);
         return basic;
     }
 
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 148fde59..e0b34131 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -508,12 +508,13 @@ 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, setNull);
+        maskBase64ToPath(designSingleIncludeLayersDTO, Boolean.TRUE);
 
         // 组装入参
         DesignPythonObjects objects = pythonService.covertDesignSingleParam(

From 04ce95caa4f26402f374b210cea1f76e94bf0eff Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 15 Oct 2024 10:44:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0preview=5Fsubmit=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5to=20python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/python/PythonService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index d7f96b68..c080e682 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -2837,8 +2837,7 @@ public class PythonService {
         basic.setScale_earrings(0.16);
         basic.setBody_point_test(getMap(designLibraryModelPoint));
         basic.setLayer_order(Boolean.TRUE);
-//        basic.setPreview_submit(previewOrSubmit);
-        basic.setPreview_submit(null);
+        basic.setPreview_submit(previewOrSubmit);
         return basic;
     }