From 7697ab59fa9f6360a16e4f48ed274e5f0e74427f Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 4 Feb 2025 10:58:35 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E9=87=8D=E5=A4=8D=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E7=BB=84=E8=A3=85;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/python/PythonService.java  | 23 +++++++++++--------
 1 file changed, 13 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 9cfb9fa4..84db13bb 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -260,28 +260,31 @@ public class PythonService {
                     noPrintNum--;
                     break;
             }
-
             DesignPythonItemPrint designPythonItemPrint = getRandomPrint(elementVO, designPrintPictureType);
             elementVO.setDesignPythonItemPrint(designPythonItemPrint);
             elementVO.setDesignPrintPictureTypeLayoutList(calculateCurrentDesignPintPictureTypeLayout(elementVO.getModelSex()));
-
+            List<String> beforeAssemblyHasUseMd5List = new ArrayList<>(elementVO.getHasUseMd5List());
             DesignPythonObject pythonObject = createDesignPythonObject(elementVO, designPictureType, systemScale, singleOverall, switchCategory, i);
 
             // 如果当前对象与已组装的对象重复，则跳过当前组装
             DesignPythonObject designPythonObjectCopy = getCopy(pythonObject);
-            if (assembledObjects.contains(designPythonObjectCopy)) {
-                if (lastAssembledObject != null && assembledObjects.contains(lastAssembledObject)) {
-                    // 如果当前组装与前一个组装的对象重复，且前一个组装也重复，结束组装
-                    System.out.println("当前组装的对象与前两个组装的对象重复，结束组装。");
-                    break;
-                }
-                // 否则，跳过当前组装
+
+            boolean isDuplicate = assembledObjects.contains(designPythonObjectCopy);
+
+            if (isDuplicate) {
+//                if (lastAssembledObject != null && assembledObjects.contains(lastAssembledObject)) {
+//                    // 如果当前组装与前一个组装的对象重复，且前一个组装也重复，结束组装
+//                    System.out.println("当前组装的对象与前两个组装的对象重复，结束组装。");
+//                    break;
+//                }
+                elementVO.setHasUseMd5List(beforeAssemblyHasUseMd5List);
+                i --;
                 continue;
             }
 
             // 将当前对象添加到已组装的集合中，并记录
             assembledObjects.add(designPythonObjectCopy);
-            lastAssembledObject = designPythonObjectCopy; // 更新上一次组装的对象
+//            lastAssembledObject = designPythonObjectCopy; // 更新上一次组装的对象
 
             objects.add(pythonObject);
             redisUtil.addProcessId(processId, i + 1);