优化数据总览
This commit is contained in:
@@ -12,7 +12,6 @@ import java.time.LocalDateTime;
|
||||
@Data
|
||||
public class GetSimulationTaskFileReq extends BaseReq {
|
||||
@Schema(description = "文件所属项目节点uuid")
|
||||
@JsonProperty(value = "project")
|
||||
private String uuid;
|
||||
|
||||
@Schema(description = "文件类型", implementation = FileBizTypeEnum.class)
|
||||
|
||||
@@ -18,6 +18,7 @@ import com.sdm.data.service.IFileMetadataInfoService;
|
||||
import com.sdm.data.service.IMinioService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -44,14 +45,15 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
|
||||
|
||||
@Override
|
||||
public SdmResponse getSimulationTaskFile(GetSimulationTaskFileReq getSimulationTaskFileReq) {
|
||||
FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getRelatedResourceUuid, getSimulationTaskFileReq.getUuid()).one();
|
||||
if(fileMetadataInfo == null) {
|
||||
return SdmResponse.success();
|
||||
}
|
||||
|
||||
QueryBigFileReq queryBigFileReq = new QueryBigFileReq();
|
||||
BeanUtils.copyProperties(getSimulationTaskFileReq, queryBigFileReq);
|
||||
queryBigFileReq.setDirId(fileMetadataInfo.getId());
|
||||
|
||||
|
||||
FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getRelatedResourceUuid, getSimulationTaskFileReq.getUuid()).one();
|
||||
if(ObjectUtils.isNotEmpty(fileMetadataInfo)) {
|
||||
queryBigFileReq.setDirId(fileMetadataInfo.getId());
|
||||
}
|
||||
|
||||
SdmResponse<PageDataResp<List<FileStorage>>> searchResult = dataStorageAnalysis.listBigFile(queryBigFileReq);
|
||||
PageDataResp<List<FileStorage>> pageDataResp = searchResult.getData();
|
||||
List<FileStorage> data = pageDataResp.getData();
|
||||
@@ -60,12 +62,9 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
|
||||
}
|
||||
List<Long> fileIdList = data.stream().map(FileStorage::getFileId).toList();
|
||||
|
||||
|
||||
|
||||
List<FileMetadataInfo> simulationTaskFileMetadataInfos = fileMetadataInfoService
|
||||
.lambdaQuery()
|
||||
.in(FileMetadataInfo::getId, fileIdList)
|
||||
.eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())
|
||||
.list();
|
||||
|
||||
PageInfo<FileMetadataInfo> pageInfo = new PageInfo<>(simulationTaskFileMetadataInfos);
|
||||
|
||||
@@ -181,7 +181,6 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
|
||||
simulationParameterLibraryCategoryObjectResp.setParameterJsonValue(parameterJsonValueFromJsonNode);
|
||||
} catch (IOException e) {
|
||||
log.error("解析JSON文件时发生错误", e);
|
||||
return SdmResponse.failed("解析JSON文件时发生错误");
|
||||
}
|
||||
return SdmResponse
|
||||
.success(simulationParameterLibraryCategoryObjectResp);
|
||||
|
||||
Reference in New Issue
Block a user