From 5f52e7f020ddff8077676d8895fd3c70d8385564 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 7 Jan 2025 12:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industry/software/manage/service/FileSystemService.java | 2 +-
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java   | 1 +
 .../manage/service/serviceimpl/FileSystemServiceImpl.java   | 6 ++++--
 electrmangnetic/src/test/java/Test1.java                    | 6 +++++-
 .../industry/software/common/util/UserThreadLocal.java      | 4 +++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileSystemService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileSystemService.java
index 268ddb6..581e7ad 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileSystemService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileSystemService.java
@@ -20,5 +20,5 @@ public interface FileSystemService {
 
     boolean writeStringToFile(String filePath, String contents);
 
-    boolean deleteFile(String filePath);
+    boolean deleteFile(String... filePaths);
 }
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 e981dc7..83f7257 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
@@ -417,6 +417,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String tmpDir = uploadDataDir + currentUserId + File.separator + uuid + File.separator;
         ZipUtil.unzip(zipDirPath, tmpDir);
         update2Database(zipDirPath);
+        fileSystemService.deleteFile(zipDirPath, destColibPath);
         return ElectromagneticResultUtil.success(true);
     }
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileSystemServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileSystemServiceImpl.java
index 04eea92..09b737d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileSystemServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileSystemServiceImpl.java
@@ -61,8 +61,10 @@ public class FileSystemServiceImpl implements FileSystemService {
     }
 
     @Override
-    public boolean deleteFile(String filePath) {
-        FileUtil.del(filePath);
+    public boolean deleteFile(String... filePaths) {
+        for (String filePath : filePaths) {
+            FileUtil.del(filePath);
+        }
         return false;
     }
 }
diff --git a/electrmangnetic/src/test/java/Test1.java b/electrmangnetic/src/test/java/Test1.java
index 8214a15..5380d65 100644
--- a/electrmangnetic/src/test/java/Test1.java
+++ b/electrmangnetic/src/test/java/Test1.java
@@ -5,6 +5,7 @@
 //import cn.hutool.crypto.symmetric.AES;
 //import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 //import com.electromagnetic.industry.software.manage.Application;
+//import com.electromagnetic.industry.software.manage.service.FileSystemService;
 //import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileInfoServiceImpl;
 //import org.junit.jupiter.api.Test;
 //import org.springframework.beans.factory.annotation.Value;
@@ -24,6 +25,8 @@
 //
 //    @Resource
 //    private EdFileInfoServiceImpl edFileInfoServiceImpl;
+//    @Resource
+//    private FileSystemService fileSystemService;
 //
 //    @Value("${file.security.passwd}")
 //    private String password;
@@ -44,7 +47,7 @@
 //    @Test
 //    public void testImport() {
 //        String currentUserId = UserThreadLocal.getUserId();
-//        String destColibPath = "E:/tmp/C92934test.colib";
+//        String destColibPath = "E:/tmp/测试沿用.colib";
 //        String mainName = FileUtil.mainName(destColibPath);
 //        String parentDir = FileUtil.getParent(destColibPath, 1);
 //        String zipDirPath = parentDir + File.separator + mainName + ".zip";
@@ -64,6 +67,7 @@
 //        ZipUtil.unzip(zipDirPath, tmpDir);
 //
 //        edFileInfoServiceImpl.update2Database(tmpDir);
+//        fileSystemService.deleteFile(zipDirPath, destColibPath);
 //
 //    }
 //
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
index e5ab117..10243be 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
@@ -25,7 +25,9 @@ public class UserThreadLocal {
         return userThread.get().getUserId();
     }
 
-    public static String getAdminType() {return userThread.get().getAdminType();}
+    public static String getAdminType() {
+        return userThread.get().getAdminType();
+    }
 
     public static void remove() {
         userThread.remove();