修改了部分代码。

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java

@@ -112,18 +112,22 @@ public class CommonService {
         return getDbPath(paths);
     }
 
-    public String getDbPath(List<String> ids) {
-
+    private String getDbPath(List<String> ids) {
         // TODO cache
-
         LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
-                .select(EdFileInfo::getId, EdFileInfo::getFileName)
+                .select(EdFileInfo::getId, EdFileInfo::getFileName, EdFileInfo::getDataType, EdFileInfo::getFileType, EdFileInfo::getFileCode)
                 .in(EdFileInfo::getId, ids);
         List<EdFileInfo> edFileInfos = edFileInfoMapper.selectList(queryWrapper);
-        Map<String, String> map = edFileInfos.stream().collect(Collectors.toMap(EdFileInfo::getId, EdFileInfo::getFileName));
+        Map<String, EdFileInfo> map = edFileInfos.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e));
         StringBuilder path = new StringBuilder();
         for (String id : ids) {
-            String tmp = map.get(id) + File.separator;
+            EdFileInfo fileInfo = map.get(id);
+            String tmp;
+            if (fileInfo.getDataType().equals(EleDataTypeEnum.FILE.code)) {
+                tmp = fileInfo.getFileName() + "." + fileInfo.getFileType() + "." + fileInfo.getFileCode();
+            } else {
+                tmp = fileInfo.getFileName() + File.separator;
+            }
             path.append(tmp);
         }
         return path.toString();

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

@@ -151,7 +151,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     public ElectromagneticResult<?> delete(String id) {
         EdFileInfo fileInfo = this.baseMapper.selectById(id);
         String parentId = fileInfo.getParentId();
-        if (fileInfo.getDataType() == 0) {
+        if (fileInfo.getDataType() == EleDataTypeEnum.FOLDER.code) {
             return commonService.deleteFolder(id, parentId);
         }
 
@@ -171,7 +171,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
 
         try {
             EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.<EdFileInfo>lambdaQuery().eq(EdFileInfo::getId, id));
-            String fileSysPath = commonService.getFileSysPath(fileInfo.getFilePath()) + "." + fileInfo.getFileCode();
+            String fileSysPath = commonService.getFileSysPath(fileInfo.getFilePath());
             Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在。");
             FileSystemResource fileSystemResource = new FileSystemResource(fileSysPath);
             HttpHeaders headers = new HttpHeaders();
@@ -207,7 +207,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .eq(EdFileInfo::getId, updateFileInfoDTO.getId())
                     .set(EdFileInfo::getFileName, updateFileInfoDTO.getFileName())
                     .set(EdFileInfo::getFileNote, updateFileInfoDTO.getFileNote()));
-            String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath());
+            String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath()); // file or folder
             fileSystemService.renameFile(sysFilePath, updateFileInfoDTO.getFileName());
             return ElectromagneticResultUtil.success(true);
         } catch (Exception e) {
@@ -506,11 +506,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         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());
         for (EdFileInfo edFileInfo : folders) {
-            String destFolderPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getFileSysPath(edFileInfo.getFileId());
+            String destFolderPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getFileSysPath(edFileInfo.getFileId()); // file
             fileSystemService.createDirectory(destFolderPath);
         }
         for (EdFileInfo edFileInfo : files) {
-            String filePath = commonService.getFileSysPath(edFileInfo.getFileId()) + edFileInfo.getFileCode() + "." + edFileInfo.getFileCode();
+            String filePath = commonService.getFileSysPath(edFileInfo.getFileId()); // file
             String destPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFileId());
             fileSystemService.copyFile(filePath, destPath);
         }
@@ -597,7 +597,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                         .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                         .setPrjDir(false);
                 this.baseMapper.insert(newEdFileInfo);
-                String fileDestPath = commonService.getFileSysPath(parentFolderInfo.getFilePath()) + File.separator + mainName + "." + suffix + "." + fileCode;
+                String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
                 fileSystemService.save(file.getInputStream(), fileDestPath);
             }
         } catch (Exception e) {
@@ -636,7 +636,15 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         return moveFile(id, targetFolderId, strategy, true);
     }
 
-    private void handMoveConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo, boolean deleteSrc) {
+    private ElectromagneticResult<?> handMoveConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo, boolean deleteSrc) {
+
+        // 禁止同目录下移动和复制
+        if (srcFileInfo.getParentId().equals(destFolderInfo.getId())) {
+            String info = "禁止相同文件夹下移动文件";
+            log.info(info);
+            return ElectromagneticResultUtil.fail("-1", info);
+        }
+
         if (strategy == 2) {
             // 做版本更新
             List<EdFileInfo> sameFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
@@ -646,15 +654,21 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             Integer maxFileVersion = Collections.max(sameFileInfos, Comparator.comparing(EdFileInfo::getFileVersion)).getFileVersion();
             String newFileDbId = IdWorker.getSnowFlakeIdString();
             String fileTime = EleCommonUtil.getNowTimeStr();
-            String fileCode = commonService.createFileCode(targetFolderId, srcFileInfo.getFileType(), maxFileVersion + 1, fileTime);
-            EdFileInfo destSaveFileInfo = BeanUtil.copyProperties(sameFileInfos.get(0), EdFileInfo.class);
-            destSaveFileInfo.newInit();
+            String codePathByDbPath = commonService.getCodePathByDbPath(destFolderInfo.getFilePath());
+            String fileCode = commonService.createFileCode(codePathByDbPath, srcFileInfo.getFileType(), maxFileVersion + 1, fileTime);
+            EdFileInfo fileInfoTmp = sameFileInfos.get(0);
+            EdFileInfo destSaveFileInfo = BeanUtil.copyProperties(fileInfoTmp, EdFileInfo.class);
+            destSaveFileInfo.setId(newFileDbId);
             destSaveFileInfo.setFileVersion(maxFileVersion + 1)
-                    .setFilePath(destSaveFileInfo + MYSQL_FILE_PATH_SPLIT + newFileDbId)
+                    .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFileDbId)
                     .setPreVersion(maxFileVersion)
                     .setEffectFlag(EffectFlagEnum.EFFECT.code)
                     .setFileCode(fileCode);
             this.baseMapper.insert(destSaveFileInfo);
+            String srcFilePath = commonService.getFileSysPath(srcFileInfo.getFilePath());
+            String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath());
+            fileSystemService.moveFile(srcFilePath, destFilePath, true);
+            this.baseMapper.deleteById(srcFileInfo.getId());
         } else if (strategy == 3) {
             // 文件名加“_1”，版本号从100开始
             // 处理MySQL相关逻辑
@@ -671,44 +685,43 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String destFileSysPath = commonService.getFileSysPath(destFolderInfo.getFilePath());
             fileSystemService.moveFile(srcFileSysPath, destFileSysPath, deleteSrc);
         }
+        return ElectromagneticResultUtil.success(true);
     }
 
-    private ElectromagneticResult<?> moveFile(String id, String targetFolderId, Integer strategy, boolean deleteSrc) {
+    public ElectromagneticResult<?> moveFile(String id, String targetFolderId, Integer strategy, boolean deleteSrc) {
         // 获取原文件mysql模型
         EdFileInfo srcFileInfo = this.baseMapper.selectById(id);
+        String srcFileDbPath = srcFileInfo.getFilePath();
+        String fileCode = srcFileInfo.getFileCode();
         // 判断目标路径下是否有同名文件，如果所有的同名文件：1）如果所有文件都已经被作废，则该文件为新文件，版本号从100开始。2）如果有没有被作废的文件，则冲突处理方式按---1-跳过冲突文件 2-做版本更新 3-重命名，文件名加"_1"
-        List<EdFileInfo> destFolderFiles = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, targetFolderId));
-        EdFileInfo destFolderInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getId, targetFolderId));
-        List<EdFileInfo> effectFileInfos = destFolderFiles.stream().filter(e -> Objects.equals(e.getEffectFlag(), EffectFlagEnum.EFFECT.code)).collect(Collectors.toList());
-        if (CollUtil.isEmpty(effectFileInfos) || CollUtil.isEmpty(destFolderFiles)) {
+        List<EdFileInfo> effectFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
+                .eq(EdFileInfo::getParentId, targetFolderId)
+                .eq(EdFileInfo::getFileName, srcFileInfo.getFileName())
+                .eq(EdFileInfo::getFileType, srcFileInfo.getFileType())
+                .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
+        EdFileInfo destFolderInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)
+                .eq(EdFileInfo::getId, targetFolderId));
+//        List<EdFileInfo> effectFileInfos = destFolderFiles.stream().filter(e -> Objects.equals(e.getEffectFlag(), EffectFlagEnum.EFFECT.code)).collect(Collectors.toList());
+        if (CollUtil.isEmpty(effectFileInfos)) {
             // 没有同名文件
             // 首先将信息保存到MySQL
-            EdFileInfo destSaveFileInfo = BeanUtil.copyProperties(srcFileInfo, EdFileInfo.class);
-            destSaveFileInfo.newInit();
             String fileTime = EleCommonUtil.getNowTimeStr();
-            String newFileCode = commonService.createFileCode(targetFolderId, srcFileInfo.getFileType(), FILE_START_VERSION, fileTime);
-            destSaveFileInfo.setParentId(targetFolderId)
+            String codePathByDbPath = commonService.getCodePathByDbPath(destFolderInfo.getFilePath());
+            String newFileCode = commonService.createFileCode(codePathByDbPath, srcFileInfo.getFileType(), FILE_START_VERSION, fileTime);
+            srcFileInfo.setParentId(targetFolderId)
                     .setFileVersion(FILE_START_VERSION)
                     .setFileTime(fileTime)
-                    .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + destSaveFileInfo.getId())
+                    .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + srcFileInfo.getId())
                     .setFileCode(newFileCode);
-            this.baseMapper.insert(destSaveFileInfo);
+            this.baseMapper.updateById(srcFileInfo);
             // 文件系统移动文件
-            String srcFilePath = commonService.getFileSysPath(srcFileInfo.getFileId()) + File.separator + srcFileInfo.getFileCode();
-            String destFilePath = commonService.getFileSysPath(destFolderInfo.getFileId()) + File.separator + destFolderInfo.getFileCode();
+            String srcFilePath = commonService.getFileSysPath(srcFileDbPath);
+            String destFilePath = commonService.getFileSysPath(destFolderInfo.getFilePath());
             fileSystemService.moveFile(srcFilePath, destFilePath, deleteSrc);
         } else {
-            handMoveConflict(targetFolderId, strategy, srcFileInfo, destFolderInfo, deleteSrc);
+            return handMoveConflict(targetFolderId, strategy, srcFileInfo, destFolderInfo, deleteSrc);
         }
-        // 将以前的版本effect全部置为false，删除原目录下的同名文件
-        if (deleteSrc) {
-            this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
-                    .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
-                    .eq(EdFileInfo::getParentId, srcFileInfo.getParentId())
-                    .eq(EdFileInfo::getFileName, srcFileInfo.getFileName())
-                    .eq(EdFileInfo::getFileType, srcFileInfo.getFileType()));
-        }
-        return null;
+        return ElectromagneticResultUtil.success(true);
     }
 
     /**
@@ -770,7 +783,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                     .setPrjDir(false);
             this.baseMapper.insert(newEdFileInfo);
-            String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath()) + File.separator + mainName + "." + suffix + "." + fileCode;
+            String fileDestPath = commonService.getFileSysPath(parentFileInfo.getFilePath());
             fileSystemService.save(file.getInputStream(), fileDestPath);
         } else if (strategy == 3) {
             // 文件名加”_1“，存为新文件
@@ -797,13 +810,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setPrjDir(false);
             resetFileInfoName(newEdFileInfo);
             this.baseMapper.insert(newEdFileInfo);
-            String fileDestPath = commonService.getFileSysPath(parentFileInfo.getFilePath()) + File.separator + newEdFileInfo.getFileName() + "." + suffix + "." + fileCode;
+            String fileDestPath = commonService.getFileSysPath(parentFileInfo.getFilePath());
             fileSystemService.save(file.getInputStream(), fileDestPath);
         }
 
     }
 
-
     private String doSysFileMerge(String identifier, String fileName, Integer totalChunks) {
         String currentUserId = UserThreadLocal.getUserId();
         for (int i = 1; i <= totalChunks; i++) {

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java

@@ -335,7 +335,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
                                 .setCreatedBy(currentUserId)
                                 .setUpdatedBy(currentUserId);
                         this.save(targetFile);
-                        String targetSysFilePath = commonService.getFileSysPath(targetFile.getFilePath()) + File.separator + sourceFileName;
+                        String targetSysFilePath = commonService.getFileSysPath(targetFile.getFilePath());
                         fileSystemService.createDirectory(targetSysFilePath);
                         targetEdFileInfos = commonService.selectAllAdminFolder(targetId);
                     }