TASK:模块化;
This commit is contained in:
@@ -1662,39 +1662,51 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
MoodBoardModuleSaveDTO moodBoard = moduleSaveDTO.getMoodBoard();
|
MoodBoardModuleSaveDTO moodBoard = moduleSaveDTO.getMoodBoard();
|
||||||
if (moodBoard.getMoodTemplateId() != null) {
|
if (moodBoard.getMoodTemplateId() != null) {
|
||||||
// moodboard合成图存储
|
// moodboard合成图存储
|
||||||
QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
|
CollectionElement compositeImage = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
|
||||||
qw.lambda().eq(CollectionElement::getProjectId, moduleSaveDTO.getProjectId());
|
if (compositeImage.getProjectId() == null) {
|
||||||
qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
|
compositeImage.setProjectId(moduleSaveDTO.getProjectId());
|
||||||
qw.lambda().eq(CollectionElement::getCollectionId, 0);
|
collectionElementMapper.updateById(compositeImage);
|
||||||
List<CollectionElement> compositeImageList = collectionElementMapper.selectList(qw);
|
|
||||||
if (CollectionUtils.isEmpty(compositeImageList)) {
|
|
||||||
CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
|
|
||||||
collectionElement.setProjectId(moduleSaveDTO.getProjectId());
|
|
||||||
collectionElementMapper.updateById(collectionElement);
|
|
||||||
if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
|
if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
|
||||||
// 合成图位置信息通过collectElementId关联(旧逻辑通过collectionId关联)
|
// 合成图位置信息通过collectElementId关联(旧逻辑通过collectionId关联)
|
||||||
designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
|
designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), compositeImage.getId());
|
||||||
}
|
|
||||||
}else {
|
|
||||||
CollectionElement compositeImage = compositeImageList.get(0);
|
|
||||||
if (!Objects.equals(compositeImage.getId(), moodBoard.getMoodTemplateId())) {
|
|
||||||
compositeImage.setProjectId(null);
|
|
||||||
CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
|
|
||||||
collectionElement.setProjectId(moduleSaveDTO.getProjectId());
|
|
||||||
collectionElementMapper.updateById(collectionElement);
|
|
||||||
if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
|
|
||||||
// 合成图位置信息通过collectElementId关联(旧逻辑通过collectionId关联)
|
|
||||||
designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
|
||||||
|
// qw.lambda().eq(CollectionElement::getProjectId, moduleSaveDTO.getProjectId());
|
||||||
|
// qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
|
||||||
|
//// qw.lambda().eq(CollectionElement::getCollectionId, 0);
|
||||||
|
// List<CollectionElement> compositeImageList = collectionElementMapper.selectList(qw);
|
||||||
|
// if (CollectionUtils.isEmpty(compositeImageList)) {
|
||||||
|
// CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
|
||||||
|
// collectionElement.setProjectId(moduleSaveDTO.getProjectId());
|
||||||
|
// collectionElementMapper.updateById(collectionElement);
|
||||||
|
// if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
|
||||||
|
// // 合成图位置信息通过collectElementId关联(旧逻辑通过collectionId关联)
|
||||||
|
// designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
|
||||||
|
// }
|
||||||
|
// }else {
|
||||||
|
// CollectionElement compositeImage = compositeImageList.get(0);
|
||||||
|
// if (!Objects.equals(compositeImage.getId(), moodBoard.getMoodTemplateId())) {
|
||||||
|
// compositeImage.setProjectId(null);
|
||||||
|
// CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
|
||||||
|
// collectionElement.setProjectId(moduleSaveDTO.getProjectId());
|
||||||
|
// collectionElementMapper.updateById(collectionElement);
|
||||||
|
// if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
|
||||||
|
// // 合成图位置信息通过collectElementId关联(旧逻辑通过collectionId关联)
|
||||||
|
// designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
List<DesignCollectionElementDTO> moodBoards = moodBoard.getMoodBoards();
|
List<DesignCollectionElementDTO> moodBoards = moodBoard.getMoodBoards();
|
||||||
if (CollectionUtil.isNotEmpty(moodBoards)) {
|
if (CollectionUtil.isNotEmpty(moodBoards)) {
|
||||||
QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
|
QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
|
||||||
qw.lambda().eq(CollectionElement::getProjectId, projectId);
|
qw.lambda().eq(CollectionElement::getProjectId, projectId);
|
||||||
qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
|
qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
|
||||||
qw.lambda().ne(CollectionElement::getCollectionId, 0);
|
if (moodBoard.getMoodTemplateId() != null) {
|
||||||
|
qw.lambda().ne(CollectionElement::getId, moodBoard.getMoodTemplateId());
|
||||||
|
}
|
||||||
|
// qw.lambda().ne(CollectionElement::getCollectionId, 0);
|
||||||
List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw);
|
List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw);
|
||||||
Set<Long> old = collectionElements.stream().map(CollectionElement::getId).collect(Collectors.toSet());
|
Set<Long> old = collectionElements.stream().map(CollectionElement::getId).collect(Collectors.toSet());
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user