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

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-08-19 09:33:16 +08:00
parent 42273750f4 552ec828ab
commit 80957bfc00
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
View File

@@ -171,7 +171,12 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
if (!StringUtils.isEmpty(query.getAgeGroup())) {
// queryWrapper.eq("level3_type", query.getAgeGroup());
queryWrapper.eq("age_group", query.getAgeGroup());
// queryWrapper.eq("age_group", query.getAgeGroup());
queryWrapper.lambda().and(wrapper -> wrapper
.eq(Library::getLevel3Type, query.getAgeGroup())
.or()
.eq(Library::getAgeGroup, query.getAgeGroup())
);
}
if (query.getBrandId() != null) {
@@ -892,7 +897,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
Library library = CopyUtil.copyObject(sysFile, Library.class);
library.setId(null);
library.setAccountId(accountId);
library.setLevel3Type(sysFileExtra.getAgeGroup());
library.setAgeGroup(sysFileExtra.getAgeGroup());
library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD));
List<Integer> imagesWidthAndHeight = minioUtil.getImagesWidthAndHeight(sysFile.getUrl());
library.setWidth(imagesWidthAndHeight.get(0));

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

@@ -2557,12 +2557,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
if (CollectionUtil.isNotEmpty(moduleSaveDTO.getMannequin())) {
List<CollectionElementRelModel> collectionElementRelModels = collectionElementMapper.selectByProject(projectId);
List<MannequinDTO> mannequin = moduleSaveDTO.getMannequin();
List<Long> inputMannequinId = mannequin.stream().map(MannequinDTO::getId).collect(Collectors.toList());
List<Long> inputMannequinId = mannequin.stream().map(MannequinDTO::getCollectionElementId).collect(Collectors.toList());
// 创建relationId到Model的映射
Map<Long, CollectionElementRelModel> relationIdToModelMap = collectionElementRelModels.stream()
.collect(Collectors.toMap(
CollectionElementRelModel::getRelationId,
CollectionElementRelModel::getCollectionElementId,
java.util.function.Function.identity(),
(existing, replacement) -> existing
));

15
src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
View File

@@ -416,11 +416,16 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
AuthPrincipalVo userInfo = UserContext.getUserHolder();
List<ModelsVO> result = new ArrayList<>();
QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
libraryQueryWrapper.lambda().eq(Library::getAccountId, userInfo.getId());
libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
libraryQueryWrapper.lambda().eq(Library::getLevel3Type, ageGroup);
libraryQueryWrapper.lambda().orderByDesc(Library::getCreateDate);
libraryQueryWrapper.lambda()
.eq(Library::getAccountId, userInfo.getId())
.eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName())
.eq(Library::getLevel2Type, sex)
.and(wrapper -> wrapper
.eq(Library::getLevel3Type, ageGroup)
.or()
.eq(Library::getAgeGroup, ageGroup)
)
.orderByDesc(Library::getCreateDate);
List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
if (!CollectionUtils.isEmpty(libraries)) {
List<ModelVO> modelVOList = new ArrayList<>();