From 417e34b41abfbc8db259cb9bd5cbe920bb014900 Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 5 Feb 2026 16:54:45 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:1.=E9=A6=96=E6=AC=A1design=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BD=BF=E7=94=A8library=E5=92=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E5=8D=B0=E8=8A=B12.design=20overall=E5=8D=B0=E8=8A=B1?= =?UTF-8?q?=E5=A4=AA=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/python/vo/DesignPythonItemPrint.java | 14 +++++++------- .../service/impl/CollectionElementServiceImpl.java | 9 ++++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java index d73dc809..5394fca9 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -1,13 +1,13 @@ package com.ai.da.python.vo; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson.annotation.JSONField; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import lombok.Data; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; @Data public class DesignPythonItemPrint { @@ -53,7 +53,7 @@ public class DesignPythonItemPrint { if (ifDesign){ this.print_path_list = print_path_list; this.location = Collections.singletonList(Arrays.asList(0.0f, 0.0f)); - this.print_scale_list = Collections.singletonList(Arrays.asList(0.0f, 0.0f)); + this.print_scale_list = Collections.singletonList(Arrays.asList(1.0f, 1.0f)); this.print_angle_list = Arrays.asList(0.0, 0.0); } diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 76cd13bb..9632f37f 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -520,9 +520,10 @@ public class CollectionElementServiceImpl extends ServiceImpl f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) .map(DesignCollectionPrintElementDTO::getId) .collect(Collectors.toList()); + List printBoardElements = new ArrayList<>(); if (!CollectionUtils.isEmpty(printBoardIds)) { // 从数据库批量查询printBoard元素 - List printBoardElements = collectionElementMapper.selectBatchIds(printBoardIds); + printBoardElements = collectionElementMapper.selectBatchIds(printBoardIds); // 验证查询结果的完整性 if (CollectionUtil.isEmpty(printBoardElements) || printBoardElements.size() != printBoardIds.size()) { throw new BusinessException("get.printBoards.data.is.mismatch"); @@ -543,7 +544,8 @@ public class CollectionElementServiceImpl extends ServiceImpl idToMap = designDTO.getPrintBoards() .stream() .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId, v -> v)); - libraryCollectionElements.addAll(covertLibrarysToPrintCollections(librarys, idToMap)); + printBoardElements.addAll(covertLibrarysToPrintCollections(librarys, idToMap)); +// libraryCollectionElements.addAll(covertLibrarysToPrintCollections(librarys, idToMap)); } } @@ -559,7 +561,8 @@ public class CollectionElementServiceImpl extends ServiceImpl idToMap = designDTO.getPrintBoards() .stream() .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId, v -> v)); - generateCollectionElements.addAll(covertGeneratesToPrintCollections(generateDetailList, idToMap)); + printBoardElements.addAll(covertGeneratesToPrintCollections(generateDetailList, idToMap)); +// generateCollectionElements.addAll(covertGeneratesToPrintCollections(generateDetailList, idToMap)); } } }