aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TASK:batch toProductImage;chatStream;

Browse Source
This commit is contained in:
shahaibo
2025-06-05 15:33:08 +08:00
parent 4e80493a26
commit bab5c9a8e6
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/mapper/primary/entity/ThreeDModule.java
View File

@@ -20,7 +20,7 @@ public class ThreeDModule implements Serializable {
private Long id; private Long id;
private Long projectId; private Long projectId;
private Long threeDSimpleId; private Long threeDSimpleId;
private Long collectionElementId; private String printMinioUrl;
private BigDecimal x; private BigDecimal x;
private BigDecimal y; private BigDecimal y;
} }

2
src/main/java/com/ai/da/model/dto/PatternMaking3DDTO.java
View File

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
@Data @Data
public class PatternMaking3DDTO { public class PatternMaking3DDTO {
private Long threeDSimpleId; private Long threeDSimpleId;
private Long collectionElementId; private String printMinioUrl;
private BigDecimal x; private BigDecimal x;
private BigDecimal y; private BigDecimal y;
} }

2
src/main/java/com/ai/da/model/vo/ThreeDModuleVO.java
View File

@@ -5,5 +5,5 @@ import lombok.Data;
@Data @Data
public class ThreeDModuleVO extends ThreeDModule { public class ThreeDModuleVO extends ThreeDModule {
private String printMinioUrl; // private String printMinioUrl;
} }

21
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -1712,12 +1712,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
ThreeDModule threeDModule = threeDModules.get(0); ThreeDModule threeDModule = threeDModules.get(0);
if (null != threeDModule.getThreeDSimpleId()){ if (null != threeDModule.getThreeDSimpleId()){
ThreeDModuleVO threeDModuleVO = CopyUtil.copyObject(threeDModule, ThreeDModuleVO.class); ThreeDModuleVO threeDModuleVO = CopyUtil.copyObject(threeDModule, ThreeDModuleVO.class);
if (null != threeDModule.getCollectionElementId()) { // if (null != threeDModule.getCollectionElementId()) {
CollectionElement collectionElement = collectionElementMapper.selectById(threeDModule.getCollectionElementId()); // CollectionElement collectionElement = collectionElementMapper.selectById(threeDModule.getCollectionElementId());
if (Objects.nonNull(collectionElement)) { // if (Objects.nonNull(collectionElement)) {
threeDModuleVO.setPrintMinioUrl(minioUtil.getPreSignedUrl(collectionElement.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); // threeDModuleVO.setPrintMinioUrl(minioUtil.getPreSignedUrl(collectionElement.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
} // }
} // }
moduleChooseVO.setPatternMaking3D(threeDModuleVO); moduleChooseVO.setPatternMaking3D(threeDModuleVO);
} }
} }
@@ -1982,19 +1982,20 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId()); threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId());
threeDModule.setX(patternMaking3D.getX()); threeDModule.setX(patternMaking3D.getX());
threeDModule.setY(patternMaking3D.getY()); threeDModule.setY(patternMaking3D.getY());
threeDModule.setCollectionElementId(patternMaking3D.getCollectionElementId()); threeDModule.setPrintMinioUrl(patternMaking3D.getPrintMinioUrl());
threeDModuleMapper.insert(threeDModule); threeDModuleMapper.insert(threeDModule);
}else { }else {
ThreeDModule threeDModule = threeDModuleList.get(0); ThreeDModule threeDModule = threeDModuleList.get(0);
if (!Objects.equals(patternMaking3D.getThreeDSimpleId(), threeDModule.getThreeDSimpleId())) { // if (!Objects.equals(patternMaking3D.getThreeDSimpleId(), threeDModule.getThreeDSimpleId())) {
//
// }
threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId()); threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId());
threeDModule.setX(patternMaking3D.getX()); threeDModule.setX(patternMaking3D.getX());
threeDModule.setY(patternMaking3D.getY()); threeDModule.setY(patternMaking3D.getY());
threeDModule.setCollectionElementId(patternMaking3D.getCollectionElementId()); threeDModule.setPrintMinioUrl(patternMaking3D.getPrintMinioUrl());
threeDModuleMapper.updateById(threeDModule); threeDModuleMapper.updateById(threeDModule);
} }
} }
}
if (CollectionUtil.isNotEmpty(moduleSaveDTO.getMannequin())) { if (CollectionUtil.isNotEmpty(moduleSaveDTO.getMannequin())) {
QueryWrapper<CollectionElement> qw = new QueryWrapper<>(); QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
qw.lambda().eq(CollectionElement::getProjectId, projectId); qw.lambda().eq(CollectionElement::getProjectId, projectId);