From df2547ff81a0424e4f7875a8ff170ca965154367 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 25 Feb 2025 14:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/python/PythonService.java   |  2 +-
 .../da/service/impl/DesignItemServiceImpl.java | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index 75fb7b62..02b9706c 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -2715,7 +2715,7 @@ public class PythonService {
             }
 
             PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
-                    designSingleItem.getPartialDesignDTO().getPartialDesignMinioPath());
+                    designSingleItem.getPartialDesign().getPartialDesignMinioPath());
             resolveDesignElement(designSingleItem.getTrims(), printToPython);
             response.add(new DesignPythonItem(
                     designSingleItem.getType(),
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 086f33a0..bf2656ed 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -448,10 +448,10 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 log.info("set labelingMask为空，便于日志打印");
                 i.setMaskUrl(null);
             }
-            if (!Objects.isNull(i.getPartialDesignDTO()) &&
-                    !StringUtil.isNullOrEmpty(i.getPartialDesignDTO().getPartialDesignBase64())){
+            if (!Objects.isNull(i.getPartialDesign()) &&
+                    !StringUtil.isNullOrEmpty(i.getPartialDesign().getPartialDesignBase64())){
                 log.info("set partialDesignBase64为空，便于日志打印");
-                i.getPartialDesignDTO().setPartialDesignBase64(null);
+                i.getPartialDesign().setPartialDesignBase64(null);
             }
         });
 
@@ -628,9 +628,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
 
     private void partialDesignBase64ToImage(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, Long accountId){
         designSingleIncludeLayersDTO.getDesignSingleItemDTOList().forEach(item -> {
-            PartialDesignDTO partialDesignDTO = item.getPartialDesignDTO();
-            if (!Objects.isNull(item.getPartialDesignDTO())
-                    && !StringUtil.isNullOrEmpty(item.getPartialDesignDTO().getPartialDesignBase64())){
+            PartialDesignDTO partialDesignDTO = item.getPartialDesign();
+            if (!Objects.isNull(item.getPartialDesign())
+                    && !StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignBase64())){
                 String path ;
                 if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath())){
                     String sourcePath = partialDesignDTO.getPartialDesignMinioPath();
@@ -644,9 +644,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                     log.error("局部design图片上传失败");
                     throw new BusinessException("partial.design.failed");
                 }
-                item.getPartialDesignDTO().setPartialDesignMinioPath(newPath);
+                item.getPartialDesign().setPartialDesignMinioPath(newPath);
             }else {
-                item.setPartialDesignDTO(new PartialDesignDTO(null));
+                item.setPartialDesign(new PartialDesignDTO(null));
             }
         });
     }
@@ -788,7 +788,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                             && (flag ? Boolean.TRUE : singleItem.getPriority().equals(layers.getPriority())))
             ).collect(Collectors.toList()));
             designItemClothesDetailVO.setGradient(singleItem.getGradient());
-            String partialDesignMinioPath = singleItem.getPartialDesignDTO().getPartialDesignMinioPath();
+            String partialDesignMinioPath = singleItem.getPartialDesign().getPartialDesignMinioPath();
             String preSignedUrl = StringUtil.isNullOrEmpty(partialDesignMinioPath) ? null : minioUtil.getPreSignedUrl(partialDesignMinioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true);
             designItemClothesDetailVO.setPartialDesign(new PartialDesignDTO(partialDesignMinioPath, preSignedUrl));
             if (categoryAndUndividedLayer.containsKey(singleItem.getType().toLowerCase())) designItemClothesDetailVO.setUndividedLayer(minioUtil.getPreSignedUrl(categoryAndUndividedLayer.get(singleItem.getType().toLowerCase()), CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true));