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

修改已知问题

This commit is contained in:
chenxudong 2025-03-27 15:51:14 +08:00
parent 3b721dd3c9
commit 46771e9a90
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
View File

@ -128,6 +128,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
.eq(EdFileInfo::getFileId, fileId)); .eq(EdFileInfo::getFileId, fileId));
for (EdFileInfo edFileInfo : edFileInfos) { for (EdFileInfo edFileInfo : edFileInfos) {
String fileSysPath = commonService.getFileSysPath(edFileInfo.getFilePath(), edFileInfo.getDataOwn()); String fileSysPath = commonService.getFileSysPath(edFileInfo.getFilePath(), edFileInfo.getDataOwn());
backupHandler.backupFiles(fileSysPath, edFileInfo.getParentId());
String fileDbPath = commonService.getDbPath(edFileInfo.getFilePath()); String fileDbPath = commonService.getDbPath(edFileInfo.getFilePath());
// 移动到tmp目录，七天后删除 // 移动到tmp目录，七天后删除
fileSystemService.moveFile(fileSysPath, elePropertyConfig.getEleTmpPath() + File.separator + new File(fileSysPath).getName()); fileSystemService.moveFile(fileSysPath, elePropertyConfig.getEleTmpPath() + File.separator + new File(fileSysPath).getName());
@ -153,13 +154,14 @@ public class FileRecycleServiceImpl implements FileRecycleService {
List<EdFileInfo> edFileInfos = this.edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) List<EdFileInfo> edFileInfos = this.edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content"))
.orderByDesc(EdFileInfo::getUpdatedTime) .orderByDesc(EdFileInfo::getFileVersion)
.eq(EdFileInfo::getFileId, fileId) .eq(EdFileInfo::getFileId, fileId)
.last("limit 1")); .last("limit 1"));
EdFileInfo edFileInfo = edFileInfos.get(0); EdFileInfo edFileInfo = edFileInfos.get(0);
String parentId = edFileInfo.getParentId(); String parentId = edFileInfo.getParentId();
Long count = this.edFileInfoMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, parentId) Long count = this.edFileInfoMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getParentId, parentId)
.eq(EdFileInfo::getFileName, edFileInfo.getFileName()) .eq(EdFileInfo::getFileName, edFileInfo.getFileName())
.eq(EdFileInfo::getFileType, edFileInfo.getFileType()) .eq(EdFileInfo::getFileType, edFileInfo.getFileType())
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code)