Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend
This commit is contained in:
@@ -1793,7 +1793,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
|
||||
minioService.copyFile(oldDirMinioObjectKey, newDirMinioObjectKey,sourceMetadataInfo.getBucketName());
|
||||
// 创建目录元数据并保存到数据库
|
||||
TagReq tagReq = new TagReq();
|
||||
BeanUtils.copyProperties(tagReq, sourceMetadataInfo);
|
||||
BeanUtils.copyProperties(sourceMetadataInfo, tagReq);
|
||||
tagReq.setRunId(null);
|
||||
FileMetadataInfo fileInfo = createFileMetadata(newDirMinioObjectKey, sourceMetadataInfo.getOriginalName(),
|
||||
null, null, null, targetParentMetadataInfo.getId(), sourceMetadataInfo.getFileSize(), sourceMetadataInfo.getSortOrder(), tagReq);
|
||||
|
||||
@@ -782,8 +782,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
{
|
||||
if(fileMetadataInfoResp == null)
|
||||
continue;
|
||||
long parentId = fileMetadataInfoResp.getParentId();
|
||||
long fileId = fileMetadataInfoResp.getId();
|
||||
//long parentId = fileMetadataInfoResp.getParentId();
|
||||
//long fileId = fileMetadataInfoResp.getId();
|
||||
String fileName = fileMetadataInfoResp.getOriginalName();
|
||||
if(!standard.isEmpty())
|
||||
{
|
||||
@@ -793,7 +793,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
{
|
||||
standardName += ";";
|
||||
}
|
||||
standard += parentId+","+fileId;
|
||||
standard += fileMetadataInfoResp.getAllParentIds();
|
||||
standardName += fileName;
|
||||
taskObject.put("standard",standard);
|
||||
taskObject.put("standardName",standardName);
|
||||
|
||||
Reference in New Issue
Block a user