chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenxudong:061516f82e8fad71a021a668e43acb2857de342e
Branches Tags
chenxudong:master
chenxudong:release3.0.8
chenxudong:develop
chenxudong:test
chenxudong:release3.0.7
chenxudong:release3.0.6
chenxudong:release3.0.5
chenxudong:release3.0.4
chenxudong:release3.0.3
chenxudong:release3.0.2
chenxudong:release3.0.1
chenxudong:release3
chenxudong:release2
...
compare: chenxudong:cf40b68ccd01e9cc8066e66d03a4b87edb7950af
Branches Tags
chenxudong:release3.0.8
chenxudong:develop
chenxudong:test
chenxudong:release3.0.7
chenxudong:release3.0.6
chenxudong:release3.0.5
chenxudong:release3.0.4
chenxudong:release3.0.3
chenxudong:release3.0.2
chenxudong:release3.0.1
chenxudong:release3
chenxudong:release2
chenxudong:master

2 Commits
061516f82e ... cf40b68ccd

Author SHA1 Message Date
chenxudong cf40b68ccd Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-03 10:30:34 +08:00
chenxudong de4f48507c 调通文件导出接口 2025-01-03 10:30:24 +08:00
1 changed files with 14 additions and 8 deletions
Show Stats Expand all files Collapse all files

22
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -560,23 +560,28 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.eq(EdFileInfo::getEffectFlag, true)); .eq(EdFileInfo::getEffectFlag, true));
resFiles.addAll(edFileInfos); resFiles.addAll(edFileInfos);
} }
String prjId = resFiles.get(0).getFilePath().split(MYSQL_FILE_PATH_SPLIT)[0];
List<EdFileInfo> prjFolders = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getPrjDir, true).eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); List<EdFileInfo> prjFolders = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT)
.eq(EdFileInfo::getPrjDir, true)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
EdFileInfo prjFileInfo = this.baseMapper.selectById(prjId);
Map<String, EdFileInfo> prjFoldersMap = prjFolders.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); Map<String, EdFileInfo> prjFoldersMap = prjFolders.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e));
Map<String, EdFileInfo> tmps = resFiles.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); Map<String, EdFileInfo> tmps = resFiles.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e));
tmps.putAll(prjFoldersMap);
resFiles.clear(); resFiles.clear();
resFiles.addAll(tmps.values()); resFiles.addAll(tmps.values());
resFiles.addAll(prjFoldersMap.values()); resFiles.add(prjFileInfo);
String prjName = commonService.getPrjNameByDbPath(resFiles.get(0).getFilePath()); String prjName = commonService.getPrjNameByDbPath(resFiles.get(0).getFilePath());
List<EdFileInfo> folders = resFiles.stream().filter(e -> e.getDataType().equals(EleDataTypeEnum.FOLDER.code)).collect(Collectors.toList()); List<EdFileInfo> folders = resFiles.stream().filter(e -> e.getDataType().equals(EleDataTypeEnum.FOLDER.code)).collect(Collectors.toList());
List<EdFileInfo> files = resFiles.stream().filter(e -> e.getDataType().equals(EleDataTypeEnum.FILE.code)).collect(Collectors.toList()); List<EdFileInfo> files = resFiles.stream().filter(e -> e.getDataType().equals(EleDataTypeEnum.FILE.code)).collect(Collectors.toList());
for (EdFileInfo edFileInfo : folders) { for (EdFileInfo edFileInfo : folders) {
String destFolderPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getFileSysPath(edFileInfo.getFileId()); // file String destFolderPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFilePath()); // file
fileSystemService.createDirectory(destFolderPath); fileSystemService.createDirectory(destFolderPath);
} }
for (EdFileInfo edFileInfo : files) { for (EdFileInfo edFileInfo : files) {
String filePath = commonService.getFileSysPath(edFileInfo.getFileId()); // file String filePath = commonService.getFileSysPath(edFileInfo.getFilePath()); // file
String destPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFileId()); String destPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFilePath());
fileSystemService.copyFile(filePath, destPath); fileSystemService.copyFile(filePath, destPath);
} }
String mysqlInfo = JSONUtil.toJsonStr(resFiles); String mysqlInfo = JSONUtil.toJsonStr(resFiles);
@ -596,6 +601,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
throw new BizException(-1, info); throw new BizException(-1, info);
} finally { } finally {
fileSystemService.deleteFile(exportZipFile); fileSystemService.deleteFile(exportZipFile);
fileSystemService.deleteFile(downloadDataDir + File.separator + prjName);
} }
File file = FileUtil.newFile(exportColibFile); File file = FileUtil.newFile(exportColibFile);
FileSystemResource fileSystemResource = new FileSystemResource(file); FileSystemResource fileSystemResource = new FileSystemResource(file);
@ -627,8 +633,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
public ElectromagneticResult<?> upload(String parentId, MultipartFile file, Integer strategy) { public ElectromagneticResult<?> upload(String parentId, MultipartFile file, Integer strategy) {
Assert.isTrue(EleCommonUtil.isFileNameValid(file.getOriginalFilename()), NAME_VALID_MSG); Assert.isTrue(EleCommonUtil.isFileNameValid(file.getOriginalFilename()), NAME_VALID_MSG);
EdFileInfo fileInfo = this.baseMapper.selectById(parentId); // EdFileInfo fileInfo = this.baseMapper.selectById(parentId);
Assert.isTrue(fileInfo.getDataType().equals(EleDataTypeEnum.FOLDER.code) && !fileInfo.getPrjDir(), "层级目录不允许上传文件"); // Assert.isTrue(fileInfo.getDataType().equals(EleDataTypeEnum.FOLDER.code) && !fileInfo.getPrjDir(), "层级目录不允许上传文件");
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
String mainName = FileUtil.mainName(fileName); String mainName = FileUtil.mainName(fileName);
String suffix = FileUtil.getSuffix(fileName); String suffix = FileUtil.getSuffix(fileName);