From e1e6e9f466c6a09011336d38bff18cbfb4ca61ce Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 16 Apr 2025 13:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89uuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/backup/controller/FileController.java         | 4 ++--
 .../industry/software/backup/service/FileService.java      | 2 +-
 .../software/backup/serviceimp/FileServiceImpl.java        | 4 ++--
 .../industry/software/manage/pojo/models/EdFileInfo.java   | 4 ----
 .../software/manage/service/serviceimpl/CommonService.java | 7 ++-----
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java  | 1 -
 .../manage/service/serviceimpl/FileBackLogServiceImpl.java | 2 +-
 .../industry/software/manage/tasks/BackupHandler.java      | 4 ++--
 8 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
index 4415b8f..525e7c0 100644
--- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
+++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
@@ -65,8 +65,8 @@ public class FileController {
 //    }
 
     @RequestMapping("/download")
-    public ResponseEntity<InputStreamResource> download(@RequestParam("id") String id, @RequestParam("uuid") String uuid) throws Exception {
-        return fileService.download(id, uuid);
+    public ResponseEntity<InputStreamResource> download(@RequestParam("id") String id) throws Exception {
+        return fileService.download(id);
     }
 
     @RequestMapping("/backupSql")
diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java
index a8e94dd..21f924c 100644
--- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java
+++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java
@@ -12,7 +12,7 @@ public interface FileService {
 
 //    void remove(String id);
 
-    ResponseEntity<InputStreamResource> download(String id, String uuid) throws Exception;
+    ResponseEntity<InputStreamResource> download(String id) throws Exception;
 
     void backupSql(MultipartFile file) throws Exception;
 }
diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java
index aa313ff..296fcff 100644
--- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java
+++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java
@@ -41,8 +41,8 @@ public class FileServiceImpl implements FileService {
 //    }
 
     @Override
-    public ResponseEntity<InputStreamResource> download(String id, String uuid) throws Exception {
-        String destPath = getFileSysPathById(id + "_" + uuid);
+    public ResponseEntity<InputStreamResource> download(String id) throws Exception {
+        String destPath = getFileSysPathById(id);
         FileSystemResource fileSystemResource = new FileSystemResource(destPath);
         return ResponseEntity
                 .ok()
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
index 3e7d7e3..fba5bb4 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
@@ -125,9 +125,6 @@ public class EdFileInfo extends BaseModel {
     @TableField(value = "permanent_deleted")
     private Boolean permanentDeleted;
 
-    @TableField(value = "uuid")
-    private String uuid;
-
     public void newInit() {
         String userId = UserThreadLocal.getUserId();
         String newFileDbId = IdWorker.getSnowFlakeIdString();
@@ -141,6 +138,5 @@ public class EdFileInfo extends BaseModel {
         this.setCreatedBy(userId);
         this.setFileId(newFileDbId);
         this.setEffectFlag(EffectFlagEnum.EFFECT.code);
-        this.setUuid(IdUtil.fastSimpleUUID());
     }
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
index 5b32c64..05da72d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
@@ -138,16 +138,13 @@ public class CommonService {
 
     public String getFileSysPath(String id) {
         EdFileInfo fileInfo = edFileInfoMapper.selectById(id);
-        String uuid = fileInfo.getUuid();
-        String fileType = fileInfo.getFileType();
         int dataOwnCode = fileInfo.getDataOwn();
         DataOwnEnum enumByCode = DataOwnEnum.getEnumByCode(dataOwnCode);
-        String fileName = id + MYSQL_FILE_PATH_SPLIT + uuid + "." + fileType;
         String filePath;
         switch (Objects.requireNonNull(enumByCode)) {
-            case SYS_FILE, SYS_PRJ, REPO_PRJ, REPO_FILE -> filePath = getPrjRootPath1(dataOwnCode) + fileName;
+            case SYS_FILE, SYS_PRJ, REPO_PRJ, REPO_FILE -> filePath = getPrjRootPath1(dataOwnCode) + id;
             case USER_FILE, USER_PRJ ->
-                    filePath = getPrjRootPath1(dataOwnCode) + fileInfo.getCreatedBy() + File.separator + fileName;
+                    filePath = getPrjRootPath1(dataOwnCode) + fileInfo.getCreatedBy() + File.separator + id;
             default -> throw new BizException("参数错误");
         }
         return filePath;
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 8a3e431..8b38c39 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -945,7 +945,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 String codePathByDbPath = commonService.getCodePathByDbPath(parentFolderInfo.getFilePath());
                 String fileCode = commonService.createFileCode(codePathByDbPath, suffix, FILE_START_VERSION, newEdFileInfo.getFileTime());
                 newEdFileInfo.setParentId(parentId)
-                        .setUuid(IdUtil.simpleUUID())
                         .setFileCode(fileCode)
                         .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                         .setDataOwn(dataOwnCode)
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
index 84ce556..5d0f2cc 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
@@ -95,7 +95,7 @@ public class FileBackLogServiceImpl extends ServiceImpl<FileBackupLogMapper, Fil
             destPath = destPath.replace("//", "/");
             log.info("back up file path is {}", destPath);
             if (!FileUtil.exist(destPath)) {
-                byte[] bytes = backupHandler.downloadFile(edFileInfo.getId(), edFileInfo.getUuid());
+                byte[] bytes = backupHandler.downloadFile(edFileInfo.getId());
                 FileUtil.writeBytes(bytes, destPath);
                 String dbPath = commonService.getDbPath(edFileInfo.getFilePath());
                 UserThreadLocal.setSuccessInfo(edFileInfo.getParentId(), edFileInfo.getId(), "{} 恢复成功，路径为 {}", edFileInfo.getFileName() + "." + edFileInfo.getFileType(), dbPath);
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java
index 33d4c50..4e6878e 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java
@@ -52,8 +52,8 @@ public class BackupHandler {
 //        return JSONUtil.toBean(data, BackupFileResLog.class);
 //    }
 
-    public byte[] downloadFile(String id, String uuid) {
-        String url = StrFormatter.format("http://{}:{}/data/file/backup/download?id={}&&uuid=", elePropertyConfig.getRemoteHost(), elePropertyConfig.getRemotePort(), id, uuid);
+    public byte[] downloadFile(String id) {
+        String url = StrFormatter.format("http://{}:{}/data/file/backup/download?id={}", elePropertyConfig.getRemoteHost(), elePropertyConfig.getRemotePort(), id);
         return HttpUtil.downloadBytes(url);
     }
 }