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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhuxinru
2025-11-20 14:30:47 +08:00
parent e4feb8a2ff fe74d09a63
commit 5bd911d8be
6 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/sdm/common/entity/req/data/QueryDirReq.java
View File

@@ -15,7 +15,7 @@ public class QueryDirReq extends BaseReq {
private String fileName;
@Schema(description = "上传用户ID")
private Long uploadUserId;
private String uploadUserId;
// 1项目，2阶段，3学科，4学科下文件列表
@Schema(description = "类型: 1项目, 2阶段, 3学科, 4学科下文件列表", defaultValue = "0")

5
data/src/main/java/com/sdm/data/model/req/FileSearchReq.java
View File

@@ -77,4 +77,9 @@ public class FileSearchReq extends BaseReq {
*/
@Schema(description = "是否过滤空数据")
private boolean filterEmptyData;
@Schema(description = "上传人id")
private String uploadUserId;
}

3
data/src/main/java/com/sdm/data/model/req/QueryBigFileReq.java
View File

@@ -49,4 +49,7 @@ public class QueryBigFileReq extends BaseReq {
@Schema(description = "文件业务类型（1：模型文件 2：仿真报告、3：计算文件、4：曲线文件、5：云图文件，6：网格文件，7：计算过程文件）")
private Integer fileBizType;
@Schema(description = "上传人id")
private String uploadUserId;
}

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

@@ -26,6 +26,7 @@ import com.sdm.data.model.req.QueryBigFileReq;
import com.sdm.data.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -33,6 +34,7 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
@@ -283,6 +285,12 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis {
if (queryBigFileReq.getFileSize() != null && queryBigFileReq.getFileSizeUnit() != null) {
fileSizeInBytes = convertToBytes(queryBigFileReq.getFileSize(), queryBigFileReq.getFileSizeUnit());
}
List<Long> userIds = StringUtils.isBlank(queryBigFileReq.getUploadUserId())
? new ArrayList<>()
: Arrays.stream(queryBigFileReq.getUploadUserId().split(","))
.filter(StringUtils::isNotBlank)
.map(Long::valueOf)
.collect(Collectors.toList());
List<Long> fileIds = fileStorageService.lambdaQuery()
.select(FileStorage::getFileId)
.eq(ObjectUtils.isNotEmpty(queryBigFileReq.getDirId()), FileStorage::getDirId, queryBigFileReq.getDirId())
@@ -292,6 +300,7 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis {
.gt(ObjectUtils.isNotEmpty(queryBigFileReq.getStartTime()), FileStorage::getCreateTime, queryBigFileReq.getStartTime())
.lt(ObjectUtils.isNotEmpty(queryBigFileReq.getEndTime()), FileStorage::getCreateTime, queryBigFileReq.getEndTime())
.gt(ObjectUtils.isNotEmpty(fileSizeInBytes), FileStorage::getFileSize, fileSizeInBytes)
.in(org.apache.commons.collections4.CollectionUtils.isNotEmpty(userIds), FileStorage::getUserId, userIds)
.list().stream()
.map(FileStorage::getFileId)
.collect(Collectors.toList());

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

@@ -633,12 +633,18 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
if (ObjectUtils.isNotEmpty(fileMetadataInfo)) {
queryBigFileReq.setDirId(fileMetadataInfo.getId());
}
BeanUtils.copyProperties(minioFileSearchReq, queryBigFileReq);
List<Long> fileIdList =dataStorageAnalysis.getListBigFileId(queryBigFileReq);
if(CollectionUtils.isEmpty(fileIdList)){
return SdmResponse.success();
}
// 可变查询条件
List<Long> creatorIds = org.apache.commons.lang3.StringUtils.isBlank(queryBigFileReq.getUploadUserId())
? new ArrayList<>()
: Arrays.stream(queryBigFileReq.getUploadUserId().split(","))
.filter(org.apache.commons.lang3.StringUtils::isNotBlank)
.map(Long::valueOf)
.collect(Collectors.toList());
PageHelper.startPage(minioFileSearchReq.getCurrent(), minioFileSearchReq.getSize());
List<FileMetadataInfo> files = fileMetadataInfoService
.lambdaQuery()
@@ -646,6 +652,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
.eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())
// 这里是知识库文件：排除新增在审批的文件
.in(FileMetadataInfo::getApproveType,fileDatdList)
.in(org.apache.commons.collections4.CollectionUtils.isNotEmpty(creatorIds), FileMetadataInfo::getCreatorId, creatorIds)
.list();
setCreatorNames(files);
setCidInfos(files);
@@ -687,8 +694,14 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
} else {
return SdmResponse.success();
}
List<Long> creatorIds = org.apache.commons.lang3.StringUtils.isBlank(req.getUploadUserId())
? new ArrayList<>()
: Arrays.stream(req.getUploadUserId().split(","))
.filter(org.apache.commons.lang3.StringUtils::isNotBlank)
.map(Long::valueOf)
.collect(Collectors.toList());
List<FileMetadataInfo> list = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getParentId, parentId)
.eq(ObjectUtils.isNotEmpty(req.getUploadUserId()), FileMetadataInfo::getCreatorId, req.getUploadUserId())
.in(org.apache.commons.collections4.CollectionUtils.isNotEmpty(creatorIds), FileMetadataInfo::getCreatorId, creatorIds)
.eq(ObjectUtils.isNotEmpty(req.getQueryTarget()), FileMetadataInfo::getDataType, req.getQueryTarget())
.like(ObjectUtils.isNotEmpty(req.getFileName()), FileMetadataInfo::getOriginalName, req.getFileName())
.eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())

8
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -1293,8 +1293,10 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
addTask.setUuid(RandomUtil.generateString(32));
addTask.setOwnRootNodeUuid(ObjectUtils.isEmpty(addTask.getPid()) ? addTask.getUuid() : addTask.getPid());
addTask.setCreateTime(curDateStr);
addTask.setCreator(jobNumber);
// addTask.setCreator(jobNumber);
addTask.setTenantId(tenantId);
addTask.setNodeId(addTask.getPid());
addTask.setTaskName(addTask.getNodeName());
// 复制标签信息
copyTaskTagInfoFromParentNode(addTask,parentNode);
List<TaskExtraNode> extras = addTask.getExtras();
@@ -1304,7 +1306,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
for (TaskExtraNode extra : extras) {
extra.setNodeId(addTask.getUuid());
extra.setCreateTime(curDateStr);
extra.setCreator(jobNumber);
// extra.setCreator(jobNumber);
}
nodeExtraReqList.addAll(extras);
}
@@ -1335,7 +1337,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
if (StringUtils.isBlank(tagListProperty)) {
continue;
}
setTagProperty(addNode, "tag" + i, tagListProperty);
setTagProperty(addNode, "tag" + i, Arrays.stream(tagListProperty.split(",")).toList());
} catch (Exception e) {
throw new RuntimeException(e);
}