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

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-03-19 09:52:49 +08:00
parent 45f0d571d6 880adf7c69
commit 0a22f01587
1 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,7 +314,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
qw.lambda().eq(UserLikeGroup::getProjectId, projectId); qw.lambda().eq(UserLikeGroup::getProjectId, projectId);
List<UserLikeGroup> userLikeGroupList = userLikeGroupMapper.selectList(qw); List<UserLikeGroup> userLikeGroupList = userLikeGroupMapper.selectList(qw);
if (CollectionUtil.isEmpty(userLikeGroupList)) { if (CollectionUtil.isEmpty(userLikeGroupList)) {
throw new BusinessException("Lack of associated userLikeGroup."); return null;
} }
return userLikeGroupList.get(0); return userLikeGroupList.get(0);
} }
@@ -1267,35 +1267,37 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
} }
} }
Collection collection = collectionService.getById(collectionId); Collection collection = collectionService.getById(collectionId);
if (null != collection.getMoodboardPosition()) { if (Objects.nonNull(collection)) {
String moodboardPositionString = collectionService.getMoodboardPositionString(collection.getId()); if (null != collection.getMoodboardPosition()) {
if (StringUtils.isEmpty(moodboardPositionString)) { String moodboardPositionString = collectionService.getMoodboardPositionString(collection.getId());
moodBoardModuleChooseVO.setMoodboardPosition(collection.getMoodboardPosition()); if (StringUtils.isEmpty(moodboardPositionString)) {
}else { moodBoardModuleChooseVO.setMoodboardPosition(collection.getMoodboardPosition());
moodBoardModuleChooseVO.setMoodboardPosition(moodboardPositionString); }else {
moodBoardModuleChooseVO.setMoodboardPosition(moodboardPositionString);
}
} }
} if (collection.getMoodTemplateId() != null) {
if (collection.getMoodTemplateId() != null) { CollectionElement layoutElement = collectionElementMapper.selectById(collection.getMoodTemplateId());
CollectionElement layoutElement = collectionElementMapper.selectById(collection.getMoodTemplateId()); moodBoardModuleChooseVO.setMoodTemplateId(collection.getMoodTemplateId());
moodBoardModuleChooseVO.setMoodTemplateId(collection.getMoodTemplateId()); moodBoardModuleChooseVO.setMoodTemplateName(layoutElement.getName());
moodBoardModuleChooseVO.setMoodTemplateName(layoutElement.getName()); moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(layoutElement.getUrl(), 24 * 60));
moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(layoutElement.getUrl(), 24 * 60));
}
List<CollectionElementVO> list = new ArrayList<>();
for (CollectionElement collectionElement : collectionElements) {
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<CollectionElementVO> list = new ArrayList<>();
list.add(collectionElementVO); for (CollectionElement collectionElement : collectionElements) {
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<>();
@@ -1349,56 +1351,60 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
}else if (module.equals(Module.design.name())) { }else if (module.equals(Module.design.name())) {
DesignModuleChooseVO vo = new DesignModuleChooseVO(); DesignModuleChooseVO vo = new DesignModuleChooseVO();
UserLikeGroup group = getByProjectId(projectDTO.getId()); UserLikeGroup group = getByProjectId(projectDTO.getId());
Long userGroupId = group.getId(); if (Objects.isNull(group)) {
moduleChooseVO.setDesign(vo);
}else {
Long userGroupId = group.getId();
// if (Objects.isNull(group)) { // if (Objects.isNull(group)) {
// throw new BusinessException("history.not.found"); // throw new BusinessException("history.not.found");
// } // }
List<UserLikeVO> userLikeVOS = userLikeService.getGroupDetail(userGroupId); List<UserLikeVO> userLikeVOS = userLikeService.getGroupDetail(userGroupId);
String sex = null; String sex = null;
QueryWrapper<UserLikeSort> userLikeSortQw = new QueryWrapper<>(); QueryWrapper<UserLikeSort> userLikeSortQw = new QueryWrapper<>();
userLikeSortQw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId); userLikeSortQw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId);
List<UserLikeSort> userLikeSortList = userLikeSortMapper.selectList(userLikeSortQw); List<UserLikeSort> userLikeSortList = userLikeSortMapper.selectList(userLikeSortQw);
if (CollectionUtil.isEmpty(userLikeSortList)) { if (CollectionUtil.isEmpty(userLikeSortList)) {
Integer sort = 1; Integer sort = 1;
for (UserLikeVO userLikeVO : userLikeVOS) { for (UserLikeVO userLikeVO : userLikeVOS) {
UserLikeSort userLikeSort = new UserLikeSort(); UserLikeSort userLikeSort = new UserLikeSort();
userLikeSort.setUserLikeId(userLikeVO.getId()); userLikeSort.setUserLikeId(userLikeVO.getId());
userLikeSort.setUserLikeGroupId(userGroupId); userLikeSort.setUserLikeGroupId(userGroupId);
userLikeSort.setSort(sort); userLikeSort.setSort(sort);
userLikeSortMapper.insert(userLikeSort); userLikeSortMapper.insert(userLikeSort);
sort ++; sort ++;
}
} }
userLikeVOS.forEach(o -> {
TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId());
o.setUrl(tDesignPythonOutfit1.getDesignUrl());
if (o.getUrl().contains("/")) {
int index = o.getUrl().lastIndexOf("/");
o.setPictureName(o.getUrl().substring(index + 1));
}
o.setDesignOutfitUrl(minioUtil.getPreSignedUrl(o.getUrl(), 24 * 60));
QueryWrapper<TDesignPythonOutfit> qw = new QueryWrapper<>();
qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId());
List<TDesignPythonOutfit> tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw);
if (CollectionUtil.isNotEmpty(tDesignPythonOutfits)) {
TDesignPythonOutfit tDesignPythonOutfit = tDesignPythonOutfits.get(0);
o.setDesignOutfitId(tDesignPythonOutfit.getId());
}
QueryWrapper<UserLikeSort> userLikeSortQueryWrapper = new QueryWrapper<>();
userLikeSortQueryWrapper.lambda().eq(UserLikeSort::getUserLikeId, o.getId());
List<UserLikeSort> userLikeSorts = userLikeSortMapper.selectList(userLikeSortQueryWrapper);
if (CollectionUtil.isNotEmpty(userLikeSorts)) {
UserLikeSort userLikeSort = userLikeSorts.get(0);
o.setSort(userLikeSort.getSort());
o.setUserLikeSortId(userLikeSort.getId());
}
});
vo.setUserGroupId(userGroupId);
vo.setUserLikeDetails(userLikeVOS);
moduleChooseVO.setDesign(vo);
} }
userLikeVOS.forEach(o -> {
TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId());
o.setUrl(tDesignPythonOutfit1.getDesignUrl());
if (o.getUrl().contains("/")) {
int index = o.getUrl().lastIndexOf("/");
o.setPictureName(o.getUrl().substring(index + 1));
}
o.setDesignOutfitUrl(minioUtil.getPreSignedUrl(o.getUrl(), 24 * 60));
QueryWrapper<TDesignPythonOutfit> qw = new QueryWrapper<>();
qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId());
List<TDesignPythonOutfit> tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw);
if (CollectionUtil.isNotEmpty(tDesignPythonOutfits)) {
TDesignPythonOutfit tDesignPythonOutfit = tDesignPythonOutfits.get(0);
o.setDesignOutfitId(tDesignPythonOutfit.getId());
}
QueryWrapper<UserLikeSort> userLikeSortQueryWrapper = new QueryWrapper<>();
userLikeSortQueryWrapper.lambda().eq(UserLikeSort::getUserLikeId, o.getId());
List<UserLikeSort> userLikeSorts = userLikeSortMapper.selectList(userLikeSortQueryWrapper);
if (CollectionUtil.isNotEmpty(userLikeSorts)) {
UserLikeSort userLikeSort = userLikeSorts.get(0);
o.setSort(userLikeSort.getSort());
o.setUserLikeSortId(userLikeSort.getId());
}
});
vo.setUserGroupId(userGroupId);
vo.setUserLikeDetails(userLikeVOS);
moduleChooseVO.setDesign(vo);
}else if (module.equals(Module.canvas.name())) { }else if (module.equals(Module.canvas.name())) {
CavasModuleChooseVO vo = new CavasModuleChooseVO(); CavasModuleChooseVO vo = new CavasModuleChooseVO();