toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2025-11-25 17:34:20 +08:00
parent a4f6319414 3ab37a9923
commit d59157cc91
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
View File

@@ -895,7 +895,6 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
@Override
public SdmResponse<PageDataResp<List<FileMetadataInfoResp>>> queryDir(QueryDirReq req) {
PageHelper.startPage(req.getCurrent(), req.getSize());
Long parentId;
if (ObjectUtils.isNotEmpty(req.getFileId())) {
// 知识库的文件查询
@@ -917,6 +916,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
.filter(org.apache.commons.lang3.StringUtils::isNotBlank)
.map(Long::valueOf)
.collect(Collectors.toList());
PageHelper.startPage(req.getCurrent(), req.getSize());
List<FileMetadataInfo> list = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getParentId, parentId)
.in(org.apache.commons.collections4.CollectionUtils.isNotEmpty(creatorIds), FileMetadataInfo::getCreatorId, creatorIds)
.eq(ObjectUtils.isNotEmpty(req.getQueryTarget()), FileMetadataInfo::getDataType, req.getQueryTarget())
@@ -930,13 +930,16 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
setCidInfos(list);
setProjectName(list);
setAnalysisDirectionName(list);
PageInfo<FileMetadataInfo> page = new PageInfo<>(list);
long total = page.getTotal();
List<FileMetadataInfoResp> dtoList = list.stream().map(entity -> {
FileMetadataInfoResp dto = new FileMetadataInfoResp();
BeanUtils.copyProperties(entity, dto);
return dto;
}).collect(Collectors.toList());
PageInfo<FileMetadataInfoResp> page = new PageInfo<>(dtoList);
return PageUtils.getJsonObjectSdmResponse(dtoList, page);
PageInfo<FileMetadataInfoResp> page1 = new PageInfo<>(dtoList);
page1.setTotal(total);
return PageUtils.getJsonObjectSdmResponse(dtoList, page1);
}
@Override

2
project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
View File

@@ -60,7 +60,7 @@ public class KeyResultReq extends BaseReq {
private String fileName;
@Schema(description = "文件类型")
private String fileType;
private Integer fileType;
@Schema(description = "文件")
private MultipartFile file;