From 718e1c93f68d70e86f4121d7b8047380890e7221 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Wed, 28 May 2025 11:12:26 +0800
Subject: [PATCH] =?UTF-8?q?TASK:mannequin=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/model/vo/ValidateElementVO.java |  1 +
 .../java/com/ai/da/python/PythonService.java  | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java
index 68a70d27..682b3da2 100644
--- a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java
+++ b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java
@@ -61,4 +61,5 @@ public class ValidateElementVO {
 
     private Double brandScale;
     private List<DesignLibraryModelPointVO> mannequins;
+    private DesignLibraryModelPointVO designLibraryModelPointVO;
 }
diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index e89124cd..a82607f2 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -348,7 +348,7 @@ public class PythonService {
     private DesignPythonObject createDesignPythonObject(ValidateElementVO elementVO, CurrentDesignPictureTypeEnum designPictureType, BigDecimal systemScale, String singleOverall, String switchCategory, int i) {
         DesignPythonObject pythonObject = new DesignPythonObject();
         pythonObject.setItems(coverToDesignPythonItemNew(elementVO, designPictureType, systemScale));
-        pythonObject.setBasic(coverToBasic(pythonObject.getItems().get(0), singleOverall, switchCategory, elementVO.getDesignLibraryModelPoint(), elementVO.getMannequins()));
+        pythonObject.setBasic(coverToBasic(pythonObject.getItems().get(0), singleOverall, switchCategory, elementVO.getDesignLibraryModelPoint(), elementVO.getDesignLibraryModelPointVO()));
         if (CollectionUtil.isNotEmpty(elementVO.getRequestIdList())) {
             pythonObject.setObjectSign(elementVO.getRequestIdList().get(i));
         }
@@ -1696,12 +1696,20 @@ public class PythonService {
             //类型
             pythonItem.setType(type);
             if (SysFileLevel2TypeEnum.BODY.getRealName().equals(type)) {
-                if (Objects.nonNull(designLibraryModelPoint)) {
-                    pythonItem.setBody_path(designLibraryModelPoint.getTemplateUrl());
+                if (!CollectionUtils.isEmpty(elementVO.getMannequins())) {
+                    DesignLibraryModelPointVO vo = getRandomDesignLibraryModelPoint(elementVO.getMannequins());
+                    pythonItem.setBody_path(vo.getTemplateUrl());
+                    elementVO.setDesignLibraryModelPointVO(vo);
                 } else {
 //                    pythonItem.setBody_path("/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png");
                     pythonItem.setBody_path("aida-mannequins/model_1693218345.2714432.png");
                 }
+//                if (Objects.nonNull(designLibraryModelPoint)) {
+//                    pythonItem.setBody_path(designLibraryModelPoint.getTemplateUrl());
+//                } else {
+////                    pythonItem.setBody_path("/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png");
+//                    pythonItem.setBody_path("aida-mannequins/model_1693218345.2714432.png");
+//                }
             } else {
                 SysFileVO sysFileVO = getRandomSysFileByLevel2Type(type, Lists.newArrayList(), elementVO.getModelSex());
                 pythonItem.setPath(sysFileVO.getUrl());
@@ -2167,7 +2175,7 @@ public class PythonService {
     }
 
     private DesignPythonBasic coverToBasic(DesignPythonItem designPythonItem, String singleOverall,
-                                           String switchCategory, DesignLibraryModelPointVO designLibraryModelPoint, List<DesignLibraryModelPointVO> mannequins) {
+                                           String switchCategory, DesignLibraryModelPointVO designLibraryModelPoint, DesignLibraryModelPointVO designLibraryModelPointVO) {
         DesignPythonBasic basic = new DesignPythonBasic();
         basic.setSingle_overall(singleOverall);
         basic.setSwitch_category(switchCategory);
@@ -2180,9 +2188,8 @@ public class PythonService {
             basic.setSelf_template(Boolean.TRUE);
         }
         basic.setScale_earrings(0.16);
-        if (!CollectionUtils.isEmpty(mannequins)) {
-            DesignLibraryModelPointVO vo = getRandomDesignLibraryModelPoint(mannequins);
-            basic.setBody_point_test(getMap(vo));
+        if (Objects.nonNull(designLibraryModelPointVO)) {
+            basic.setBody_point_test(getMap(designLibraryModelPointVO));
         }else {
             basic.setBody_point_test(getMap(designLibraryModelPoint));
         }