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)); } } }