From e2085190d14932e31cdf6065c3716a866aee203c Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Fri, 25 Jul 2025 13:17:23 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E5=8D=95=E5=93=81=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=B6=89?=
 =?UTF-8?q?=E5=8F=8Abody=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/python/PythonService.java  | 21 +++++++++++--------
 .../service/impl/DesignItemServiceImpl.java   | 16 ++++++++++++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index 934e126e..c0812b55 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -2788,7 +2788,7 @@ public class PythonService {
 
         DesignPythonObject pythonObject = new DesignPythonObject();
         designPythonObjects.setProcess_id(designSingleDTO.getProcessId());
-        pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint));
+        pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint, singleOverall));
         pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint, previewOrSubmit));
         objects.add(pythonObject);
         return designPythonObjects;
@@ -2823,7 +2823,9 @@ public class PythonService {
      * @param designLibraryModelPoint
      * @return
      */
-    private List<DesignPythonItem> coverToDesignSinglePythonItem(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, DesignLibraryModelPointVO designLibraryModelPoint) {
+    private List<DesignPythonItem> coverToDesignSinglePythonItem(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO,
+                                                                 DesignLibraryModelPointVO designLibraryModelPoint,
+                                                                 String singleOverall) {
         List<DesignSingleItemDTO> designSingleItemList = designSingleIncludeLayersDTO.getDesignSingleItemDTOList();
         List<DesignPythonItem> response = new ArrayList<>();
 
@@ -2872,15 +2874,16 @@ public class PythonService {
 
         });
 
-
-        String bodyPath;
-        if (Objects.nonNull(designLibraryModelPoint)) {
-            bodyPath = designLibraryModelPoint.getTemplateUrl();
-        } else {
+        if (singleOverall.equals("overall")){
+            String bodyPath;
+            if (Objects.nonNull(designLibraryModelPoint)) {
+                bodyPath = designLibraryModelPoint.getTemplateUrl();
+            } else {
 //            bodyPath = "/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png";
-            bodyPath = "aida-mannequins/model_1693218345.2714432.png";
+                bodyPath = "aida-mannequins/model_1693218345.2714432.png";
+            }
+            response.add(new DesignPythonItem(SysFileLevel2TypeEnum.BODY.getRealName(), bodyPath, pythonTAllInfoService.getImageIdByPath(bodyPath)));
         }
-        response.add(new DesignPythonItem(SysFileLevel2TypeEnum.BODY.getRealName(), bodyPath, pythonTAllInfoService.getImageIdByPath(bodyPath)));
         return response;
     }
 
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 dd57d216..d06e8276 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -325,7 +325,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         return response;
     }
 
-    private List<TDesignPythonOutfitDetail> saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects
+    public List<TDesignPythonOutfitDetail> saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects
             , Long designId, Long designItemId, Long userId
             , JSONObject outfit, String timeZone, List<DesignSingleItemDTO> designSingleItemDTOList
             , Map<String, String> categoryAndUndividedLayer
@@ -342,7 +342,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             designItem.setModelType(modelType);
         }
         // 1、更新designItem
-        updateById(designItem);
+//        updateById(designItem);
+        updateDesignItem(designItem);
         // 2、删除designItemDetail(逻辑删除)
         designItemDetailService.deleteByDesignItemId(designItemId);
         List<DesignItemDetail> designItemDetails = Lists.newArrayList();
@@ -401,6 +402,12 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         return list;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void updateDesignItem(DesignItem designItem) {
+        // 拆分长事务为小事务
+        updateById(designItem);
+    }
+
     public List<TDesignPythonOutfitDetail> setTDesignPythonOutfitDetailList(JSONArray layers, Long designId,
                                                                             Long designPythonOutfitId, Long userId,
                                                                             Map<Integer, List<Long>> priorityOffset) {
@@ -621,6 +628,11 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 categoryAndUndividedLayer);
     }
 
+    // 方法1：仅查询（无事务）
+    public DesignItem getDesignItem(Long designItemId) {
+        return selectById(designItemId); // 普通查询，不加锁
+    }
+
     private void sketchBase64ToPath(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO){
         designSingleIncludeLayersDTO.getDesignSingleItemDTOList().forEach(item -> {
             // 如果sketch截图不为空，则将该截图上传，并替换path