From 938ad7366f4e97b77a4c7c83b97d20591f06e0e0 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 23 Apr 2025 11:22:52 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/model/vo/ModuleChooseVO.java | 2 +- .../java/com/ai/da/model/vo/ThreeDModuleVO.java | 9 +++++++++ src/main/java/com/ai/da/model/vo/ThreeDVO.java | 4 ---- .../service/impl/UserLikeGroupServiceImpl.java | 16 ++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/ai/da/model/vo/ThreeDModuleVO.java diff --git a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java index dcb92b55..e5786ba8 100644 --- a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java @@ -34,5 +34,5 @@ public class ModuleChooseVO { // private moodBoardModuleChooseVO patternMaking3D; private SketchReconstructionVO deReconstruction; - private ThreeDVO patternMaking3D; + private ThreeDModuleVO patternMaking3D; } diff --git a/src/main/java/com/ai/da/model/vo/ThreeDModuleVO.java b/src/main/java/com/ai/da/model/vo/ThreeDModuleVO.java new file mode 100644 index 00000000..d8eeaca5 --- /dev/null +++ b/src/main/java/com/ai/da/model/vo/ThreeDModuleVO.java @@ -0,0 +1,9 @@ +package com.ai.da.model.vo; + +import com.ai.da.mapper.primary.entity.ThreeDModule; +import lombok.Data; + +@Data +public class ThreeDModuleVO extends ThreeDModule { + private String printMinioUrl; +} diff --git a/src/main/java/com/ai/da/model/vo/ThreeDVO.java b/src/main/java/com/ai/da/model/vo/ThreeDVO.java index da31eef7..2537b29e 100644 --- a/src/main/java/com/ai/da/model/vo/ThreeDVO.java +++ b/src/main/java/com/ai/da/model/vo/ThreeDVO.java @@ -16,8 +16,4 @@ public class ThreeDVO { // private ThreeDPatternLayout threeDPatternLayoutUrl; private String threeDPatternLayoutUrl; private String threeDSimpleUrl; - - private BigDecimal x; - private BigDecimal y; - private String printUrl; } diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 9513b48d..5c1928f0 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1642,16 +1642,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl threeDModules = threeDModuleMapper.selectList(qw); if (CollectionUtil.isNotEmpty(threeDModules)) { ThreeDModule threeDModule = threeDModules.get(0); - ThreeDVO patternMaking3D = getLayoutDetail(threeDModule.getThreeDSimpleId()); - if (null != threeDModule.getThreeDSimpleId()) { - CollectionElement collectionElement = collectionElementMapper.selectById(threeDModule.getCollectionElementId()); - if (Objects.nonNull(collectionElement)) { - patternMaking3D.setPrintUrl(minioUtil.getPreSignedUrl(collectionElement.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); - patternMaking3D.setX(threeDModule.getX()); - patternMaking3D.setY(threeDModule.getY()); + if (null != threeDModule.getThreeDSimpleId()){ + ThreeDModuleVO threeDModuleVO = CopyUtil.copyObject(threeDModule, ThreeDModuleVO.class); + if (null != threeDModule.getCollectionElementId()) { + CollectionElement collectionElement = collectionElementMapper.selectById(threeDModule.getCollectionElementId()); + if (Objects.nonNull(collectionElement)) { + threeDModuleVO.setPrintMinioUrl(minioUtil.getPreSignedUrl(collectionElement.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + } } + moduleChooseVO.setPatternMaking3D(threeDModuleVO); } - moduleChooseVO.setPatternMaking3D(patternMaking3D); } } }