TASK:batch toProductImage;chatStream;
This commit is contained in:
@@ -20,7 +20,7 @@ public class ThreeDModule implements Serializable {
|
||||
private Long id;
|
||||
private Long projectId;
|
||||
private Long threeDSimpleId;
|
||||
private Long collectionElementId;
|
||||
private String printMinioUrl;
|
||||
private BigDecimal x;
|
||||
private BigDecimal y;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import java.math.BigDecimal;
|
||||
@Data
|
||||
public class PatternMaking3DDTO {
|
||||
private Long threeDSimpleId;
|
||||
private Long collectionElementId;
|
||||
private String printMinioUrl;
|
||||
private BigDecimal x;
|
||||
private BigDecimal y;
|
||||
}
|
||||
|
||||
@@ -5,5 +5,5 @@ import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ThreeDModuleVO extends ThreeDModule {
|
||||
private String printMinioUrl;
|
||||
// private String printMinioUrl;
|
||||
}
|
||||
|
||||
@@ -1712,12 +1712,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
||||
ThreeDModule threeDModule = threeDModules.get(0);
|
||||
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));
|
||||
}
|
||||
}
|
||||
// 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);
|
||||
}
|
||||
}
|
||||
@@ -1982,17 +1982,18 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
||||
threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId());
|
||||
threeDModule.setX(patternMaking3D.getX());
|
||||
threeDModule.setY(patternMaking3D.getY());
|
||||
threeDModule.setCollectionElementId(patternMaking3D.getCollectionElementId());
|
||||
threeDModule.setPrintMinioUrl(patternMaking3D.getPrintMinioUrl());
|
||||
threeDModuleMapper.insert(threeDModule);
|
||||
}else {
|
||||
ThreeDModule threeDModule = threeDModuleList.get(0);
|
||||
if (!Objects.equals(patternMaking3D.getThreeDSimpleId(), threeDModule.getThreeDSimpleId())) {
|
||||
threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId());
|
||||
threeDModule.setX(patternMaking3D.getX());
|
||||
threeDModule.setY(patternMaking3D.getY());
|
||||
threeDModule.setCollectionElementId(patternMaking3D.getCollectionElementId());
|
||||
threeDModuleMapper.updateById(threeDModule);
|
||||
}
|
||||
// if (!Objects.equals(patternMaking3D.getThreeDSimpleId(), threeDModule.getThreeDSimpleId())) {
|
||||
//
|
||||
// }
|
||||
threeDModule.setThreeDSimpleId(patternMaking3D.getThreeDSimpleId());
|
||||
threeDModule.setX(patternMaking3D.getX());
|
||||
threeDModule.setY(patternMaking3D.getY());
|
||||
threeDModule.setPrintMinioUrl(patternMaking3D.getPrintMinioUrl());
|
||||
threeDModuleMapper.updateById(threeDModule);
|
||||
}
|
||||
}
|
||||
if (CollectionUtil.isNotEmpty(moduleSaveDTO.getMannequin())) {
|
||||
|
||||
Reference in New Issue
Block a user