From c3e979e096493d24f01d431443448632f33a55b9 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Mon, 16 Oct 2023 11:42:20 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=20=E6=A8=A1=E7=89=B9preview;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/controller/LibraryController.java    | 3 ++-
 src/main/java/com/ai/da/python/PythonService.java            | 5 ++++-
 src/main/java/com/ai/da/service/LibraryService.java          | 2 ++
 src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java
index 25cac0de..24519fce 100644
--- a/src/main/java/com/ai/da/controller/LibraryController.java
+++ b/src/main/java/com/ai/da/controller/LibraryController.java
@@ -132,7 +132,8 @@ public class LibraryController {
             //存储template临时地址
             String path = calculateTempFileUrlNew(userInfo.getId());
             String uploadPath = minioUtil.upload("aida-tmp", path, file);
-            modelsDotDTO.setTemplateUrl(uploadPath);
+            String minioPath = libraryService.processMannequins(uploadPath);
+            modelsDotDTO.setTemplateUrl(minioPath);
         }else{
             Assert.notNull(modelsDotDTO.getLibraryId(),"libraryId cannot be empty!");
             Assert.notNull(modelsDotDTO.getTemplateId(),"templateId cannot be empty!");
diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index fb1f675a..73c11f10 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -1865,7 +1865,10 @@ public class PythonService {
         skirt.setType(SysFileLevel2TypeEnum.SKIRT.getRealName());
         skirt.setColor("none");
         skirt.setIcon("none");
-        skirt.setPrint(designPythonItemPrint);
+        DesignPythonItemPrint designPythonItemPrint1 = new DesignPythonItemPrint();
+        designPythonItemPrint1.setIfSingle(false);
+        designPythonItemPrint1.setPrint_path_list(new ArrayList<>());
+        skirt.setPrint(designPythonItemPrint1);
         skirt.setPath("aida-sys-image/images/female/trousers/trousers_974.jpg");
         response.add(skirt);
 
diff --git a/src/main/java/com/ai/da/service/LibraryService.java b/src/main/java/com/ai/da/service/LibraryService.java
index 45c54404..4a68ef72 100644
--- a/src/main/java/com/ai/da/service/LibraryService.java
+++ b/src/main/java/com/ai/da/service/LibraryService.java
@@ -69,4 +69,6 @@ public interface LibraryService extends IService<Library> {
     List<LibraryVo> getByUrlList(List<String> urlList,Long userId);
 
     Boolean updateLibraryLevel2Type(LibraryLevel2TypeUpdateDTO libraryLevel2TypeUpdateDTO);
+
+    String processMannequins(String uploadPath);
 }
diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
index ec1881f4..2f4994d4 100644
--- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
@@ -208,7 +208,8 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
         }
     }
 
-    private String processMannequins(String filePath) {
+    @Override
+    public String processMannequins(String filePath) {
         ModelPathObject modelPathObject = new ModelPathObject();
         modelPathObject.setModel_path(filePath);
         OkHttpClient client = new OkHttpClient().newBuilder()