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

TASK:模块化；

Browse Source
This commit is contained in:
shahaibo
2025-04-16 16:28:27 +08:00
parent 79d2720733
commit fe0d1f39b0
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,4 +88,6 @@ public class CollectionElement implements Serializable {
private Date updateDate; private Date updateDate;
private Long projectId; private Long projectId;
private Integer isCompositeImage;
} }

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

@@ -1400,51 +1400,35 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
MoodBoardModuleChooseVO moodBoardModuleChooseVO = new MoodBoardModuleChooseVO(); MoodBoardModuleChooseVO moodBoardModuleChooseVO = new MoodBoardModuleChooseVO();
QueryWrapper<CollectionElement> qw = new QueryWrapper<>(); QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
qw.lambda().eq(CollectionElement::getProjectId, projectDTO.getId()); qw.lambda().eq(CollectionElement::getProjectId, projectDTO.getId());
// qw.lambda().ne(CollectionElement::getCollectionId, 0);
qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName()); qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw); List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw);
Long collectionId = null;
List<CollectionElementVO> list = new ArrayList<>();
for (CollectionElement collectionElement : collectionElements) { for (CollectionElement collectionElement : collectionElements) {
if (collectionElement.getCollectionId() != null) { if (collectionElement.getIsCompositeImage() == 1) {
collectionId = collectionElement.getCollectionId(); moodBoardModuleChooseVO.setMoodTemplateId(String.valueOf(collectionElement.getId()));
break; moodBoardModuleChooseVO.setMoodTemplateName(collectionElement.getName());
} moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(collectionElement.getUrl(), 24 * 60));
}
Collection collection = collectionService.getById(collectionId); String moodboardPositionString = collectionService.getMoodboardPositionString(collectionElement.getId());
if (Objects.nonNull(collection)) { if (!StringUtils.isEmpty(moodboardPositionString)) {
if (null != collection.getMoodboardPosition()) {
String moodboardPositionString = collectionService.getMoodboardPositionString(collection.getId());
if (StringUtils.isEmpty(moodboardPositionString)) {
moodBoardModuleChooseVO.setMoodboardPosition(collection.getMoodboardPosition());
}else {
moodBoardModuleChooseVO.setMoodboardPosition(moodboardPositionString); moodBoardModuleChooseVO.setMoodboardPosition(moodboardPositionString);
} }
continue;
} }
if (collection.getMoodTemplateId() != null) { CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class);
CollectionElement layoutElement = collectionElementMapper.selectById(collection.getMoodTemplateId()); collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
moodBoardModuleChooseVO.setMoodTemplateId(collection.getMoodTemplateId()); String url = collectionElement.getUrl();
moodBoardModuleChooseVO.setMoodTemplateName(layoutElement.getName()); collectionElementVO.setOriginalUrl(url);
moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(layoutElement.getUrl(), 24 * 60)); if (minioUtil.doesObjectExist(url)) {
collectionElementVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
} }
List<CollectionElementVO> list = new ArrayList<>(); if (minioUtil.doesObjectExist(collectionElementVO.getOriginalUrl())) {
for (CollectionElement collectionElement : collectionElements) { list.add(collectionElementVO);
if (Objects.equals(collectionElement.getId(), Long.valueOf(collection.getMoodTemplateId()))) {
continue;
}
CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class);
collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
String url = collectionElement.getUrl();
collectionElementVO.setOriginalUrl(url);
if (minioUtil.doesObjectExist(url)) {
collectionElementVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
}
if (minioUtil.doesObjectExist(collectionElementVO.getOriginalUrl())) {
list.add(collectionElementVO);
}
} }
moodBoardModuleChooseVO.setMoodBoards(list);
moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO);
} }
moodBoardModuleChooseVO.setMoodBoards(list);
moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO);
}else if (module.equals(Module.printBoard.name())) { }else if (module.equals(Module.printBoard.name())) {
QueryWrapper<CollectionElement> qw = new QueryWrapper<>(); QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
@@ -1677,6 +1661,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
CollectionElement compositeImage = collectionElementMapper.selectById(moodBoard.getMoodTemplateId()); CollectionElement compositeImage = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
if (compositeImage.getProjectId() == null) { if (compositeImage.getProjectId() == null) {
compositeImage.setProjectId(moduleSaveDTO.getProjectId()); compositeImage.setProjectId(moduleSaveDTO.getProjectId());
compositeImage.setIsCompositeImage(1);
collectionElementMapper.updateById(compositeImage); collectionElementMapper.updateById(compositeImage);
if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) { if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
// 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联） // 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联）