From 8921286146e1c48c696bf8428703e65a682cee9a Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 7 Jan 2025 17:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/config/LoginInterceptor.java       |  1 -
 .../serviceimpl/EdFileInfoServiceImpl.java    | 21 ++++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java
index 13cd37e..af7a2f7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java
@@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.config;
 
 import cn.hutool.core.date.SystemClock;
 import com.electromagnetic.industry.software.common.cons.UserConstants;
-import com.electromagnetic.industry.software.common.enums.AdminTypeEnum;
 import com.electromagnetic.industry.software.common.pojo.UserLoginInfo;
 import com.electromagnetic.industry.software.common.util.TokenUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
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 5a341ea..7214323 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
@@ -597,6 +597,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public ResponseEntity<InputStreamResource> batchExport(String dataIdArr, HttpServletResponse response) throws IOException {
+        String userDownloadDataDir = downloadDataDir + File.separator + UserThreadLocal.getUserId();
         String[] ids = dataIdArr.split(",");
         Map<String, EdFileInfo> maps = new HashMap<>();
         for (String id : ids) {
@@ -622,22 +623,27 @@ 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.getDbPath(edFileInfo.getFilePath()); // file
+            String destFolderPath = userDownloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFilePath()); // file
             fileSystemService.createDirectory(destFolderPath);
         }
         for (EdFileInfo edFileInfo : files) {
             String filePath = commonService.getFileSysPath(edFileInfo.getFilePath()); // file
-            String destPath = downloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFilePath());
+            String destPath = userDownloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFilePath());
             fileSystemService.copyFile(filePath, destPath);
         }
         String mysqlInfo = JSONUtil.toJsonStr(resFiles);
-        fileSystemService.writeStringToFile(downloadDataDir + File.separator + prjName + File.separator + "mysql.info", mysqlInfo);
-        String exportZipFile = downloadDataDir + File.separator + prjName + ".zip";
-        String exportColibFile = downloadDataDir + File.separator + prjName + EXPORT_FILE_SUFFIX;
+
+        String mysqlFilePath = userDownloadDataDir + File.separator + prjName + File.separator + "mysql.info";
+        String prjDirPath = userDownloadDataDir + File.separator + prjName;
+        String exportZipFile = userDownloadDataDir + File.separator + prjName + ".zip";
+        String exportColibFile = userDownloadDataDir + File.separator + File.separator + prjName + EXPORT_FILE_SUFFIX;
+
+        fileSystemService.writeStringToFile(mysqlFilePath, mysqlInfo);
         if (FileUtil.exist(exportColibFile)) {
             FileUtil.del(exportColibFile);
         }
-        ZipUtil.zip(downloadDataDir + File.separator + prjName, exportZipFile);
+
+        ZipUtil.zip(prjDirPath, exportZipFile);
         AES aes = SecureUtil.aes(password.getBytes());
         try (
                 InputStream inputStream = Files.newInputStream(Paths.get(exportZipFile));
@@ -649,8 +655,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             log.error(info, e);
             throw new BizException(-1, info);
         } finally {
-            fileSystemService.deleteFile(exportZipFile);
-            fileSystemService.deleteFile(downloadDataDir + File.separator + prjName);
+            fileSystemService.deleteFile(exportZipFile, prjDirPath);
         }
         File file = FileUtil.newFile(exportColibFile);
         FileSystemResource fileSystemResource = new FileSystemResource(file);