test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(文件管理): 兼容历史数据处理

This commit is contained in:
fit2-zhao 2022-08-17 18:45:08 +08:00 committed by fit2-zhao
parent 540028cdab
commit aa712d30ca
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/metadata/service/FileMetadataService.java
View File

@ -253,9 +253,11 @@ public class FileMetadataService {
if (fileMetadataMapper.selectByPrimaryKey(fileMetadata.getId()) != null) { if (fileMetadataMapper.selectByPrimaryKey(fileMetadata.getId()) != null) {
fileMetadata.setUpdateTime(System.currentTimeMillis()); fileMetadata.setUpdateTime(System.currentTimeMillis());
fileMetadata.setUpdateUser(SessionUtils.getUserId()); fileMetadata.setUpdateUser(SessionUtils.getUserId());
fileMetadata.setPath(FileUtils.getFilePath(fileMetadata)); // 历史数据的路径不做更新
if (StringUtils.isNotEmpty(fileMetadata.getStorage()) && StringUtils.isEmpty(fileMetadata.getResourceType())) {
fileMetadata.setPath(FileUtils.getFilePath(fileMetadata));
}
fileMetadataMapper.updateByPrimaryKeySelective(fileMetadata); fileMetadataMapper.updateByPrimaryKeySelective(fileMetadata);
} }
} }
@ -343,6 +345,7 @@ public class FileMetadataService {
FileMetadataExample fileMetadata = new FileMetadataExample(); FileMetadataExample fileMetadata = new FileMetadataExample();
fileMetadata.createCriteria().andProjectIdIn(projectIds).andLoadJarEqualTo(true); fileMetadata.createCriteria().andProjectIdIn(projectIds).andLoadJarEqualTo(true);
List<FileMetadata> files = fileMetadataMapper.selectByExample(fileMetadata); List<FileMetadata> files = fileMetadataMapper.selectByExample(fileMetadata);
files = files.stream().filter(s -> StringUtils.isNotEmpty(s.getPath())).collect(Collectors.toList());
return files.stream().map(FileMetadata::getPath).collect(Collectors.toList()); return files.stream().map(FileMetadata::getPath).collect(Collectors.toList());
} }
return new LinkedList<>(); return new LinkedList<>();