diff --git a/src/main/java/com/ai/da/mapper/primary/ThreeDModuleMapper.java b/src/main/java/com/ai/da/mapper/primary/ThreeDModuleMapper.java new file mode 100644 index 00000000..a943bc89 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/ThreeDModuleMapper.java @@ -0,0 +1,7 @@ +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.ThreeDModule; + +public interface ThreeDModuleMapper extends CommonMapper { +} diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ThreeDModule.java b/src/main/java/com/ai/da/mapper/primary/entity/ThreeDModule.java new file mode 100644 index 00000000..fb8b89d8 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/entity/ThreeDModule.java @@ -0,0 +1,22 @@ +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("three_d_module") +public class ThreeDModule implements Serializable { + private static final long serialVersionUID = 1L; + @TableId(value = "id", type = IdType.AUTO) + private Long id; + private Long projectId; + private Long threeDSimpleId; +} diff --git a/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java b/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java index 5152a754..93bd1175 100644 --- a/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java +++ b/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java @@ -27,6 +27,8 @@ public class ModuleSaveDTO { @ApiModelProperty("手稿板图片id 数组") private List sketchBoard; + private Long patternMaking3D; + // private MoodBoardModuleChooseVO moodBoard; // private List printBoard; // private List colorBoard; 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 3cf15c4a..dcb92b55 100644 --- a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java @@ -33,4 +33,6 @@ public class ModuleChooseVO { private List poseTransfer; // private moodBoardModuleChooseVO patternMaking3D; private SketchReconstructionVO deReconstruction; + + private ThreeDVO patternMaking3D; } 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 ba68b433..86409864 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -127,6 +127,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl poseTransformationResultList = generateService.getPoseTransformationResultList(projectDTO.getId()); moduleChooseVO.setPoseTransfer(poseTransformationResultList); + }else if (module.equals(Module.patternMaking3D.name())) { + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(ThreeDModule::getProjectId, projectDTO.getId()); + List threeDModules = threeDModuleMapper.selectList(qw); + if (CollectionUtil.isNotEmpty(threeDModules)) { + ThreeDModule threeDModule = threeDModules.get(0); + ThreeDVO patternMaking3D = getLayoutDetail(threeDModule.getThreeDSimpleId()); + moduleChooseVO.setPatternMaking3D(patternMaking3D); + } } } return moduleChooseVO; @@ -1882,6 +1893,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName());