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-04-01 17:16:49 +08:00
parent 1bee672592 cf08f9126e
commit a34d775f63
4 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,8 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
@Resource
private SysFileMapper sysFileMapper;
@Resource
private SysFileExtraMapper sysFileExtraMapper;
@Resource
private FileProperties fileProperties;
@Resource
private LibraryModelPointService libraryModelPointService;
@@ -755,6 +757,12 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
sysFile.setMd5(uploadDTO.getMd5());
sysFile.setCreateDate(new Date());
sysFileMapper.insert(sysFile);
SysFileExtra extra = new SysFileExtra();
extra.setSysId(sysFile.getId());
extra.setAgeGroup(uploadDTO.getAgeGroup());
sysFileExtraMapper.insert(extra);
Library library = new Library();
library.setId(sysFile.getId());
library.setUrl(sysFile.getUrl());

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

@@ -65,6 +65,9 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
@Resource
private SysFileMapper sysFileMapper;
@Resource
private SysFileExtraMapper sysFileExtraMapper;
@Resource
private MinioUtil minioUtil;
@@ -425,6 +428,17 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
// sysFileQueryWrapper.lambda().eq(SysFile::getLevel2Type, SysFileLevel2TypeEnum.BODY.getRealName());
sysFileQueryWrapper.lambda().eq(SysFile::getLevel1Type, "Models");
sysFileQueryWrapper.lambda().eq(SysFile::getLevel2Type, sex);
QueryWrapper<SysFileExtra> sysFileExtraQueryWrapper = new QueryWrapper<>();
sysFileExtraQueryWrapper.lambda().eq(SysFileExtra::getAgeGroup, ageGroup);
List<SysFileExtra> sysFileExtras = sysFileExtraMapper.selectList(sysFileExtraQueryWrapper);
if (!CollectionUtils.isEmpty(sysFileExtras)) {
Set<Long> collect = sysFileExtras.stream().map(SysFileExtra::getSysId).collect(Collectors.toSet());
if (!CollectionUtils.isEmpty(collect)) {
sysFileQueryWrapper.lambda().in(SysFile::getId, collect);
}
}
if (!StringUtils.isEmpty(style)) {
sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style);
}
@@ -432,6 +446,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
// sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style);
// sysFileQueryWrapper.lambda().isNull(SysFile::getLevel3Type);
// }
List<SysFile> sysFileList = sysFileMapper.selectList(sysFileQueryWrapper);
if (!CollectionUtils.isEmpty(sysFileList)) {
List<ModelVO> modelVOList = new ArrayList<>();