From e34cf519005833dfa9f65b76b29a31cfe9ba20e0 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 19 Feb 2025 16:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=82=E7=BA=A7=E6=B2=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdPrjServiceImpl.java |  2 +-
 electrmangnetic/src/test/java/Test1.java      | 65 ++-----------------
 2 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index 5d6c291..926217a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -343,7 +343,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
                 Map<String, EdFileInfo> sourceFileNameMap = sourceTmpEdFiles.stream()
                         .collect(Collectors.toMap(EdFileInfo::getFileName, e -> e));
                 // 获取target当前层级的子集名称
-                List<String> targetFileNames = targetTmpEdFiles.stream()
+                List<String> targetFileNames = targetEdFileInfos.stream()
                         .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count)
                         .map(EdFileInfo::getFileName)
                         .collect(Collectors.toList());
diff --git a/electrmangnetic/src/test/java/Test1.java b/electrmangnetic/src/test/java/Test1.java
index 5380d65..dfd6148 100644
--- a/electrmangnetic/src/test/java/Test1.java
+++ b/electrmangnetic/src/test/java/Test1.java
@@ -1,74 +1,21 @@
-//import cn.hutool.core.io.FileUtil;
-//import cn.hutool.core.util.IdUtil;
-//import cn.hutool.core.util.ZipUtil;
-//import cn.hutool.crypto.SecureUtil;
-//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 com.electromagnetic.industry.software.manage.service.serviceimpl.EdPrjServiceImpl;
 //import org.junit.jupiter.api.Test;
-//import org.springframework.beans.factory.annotation.Value;
 //import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.core.env.Environment;
 //
-//import javax.annotation.PostConstruct;
 //import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.InputStream;
-//import java.io.OutputStream;
-//import java.nio.file.Files;
-//import java.nio.file.Paths;
 //
 //@SpringBootTest(classes = Application.class)
 //public class Test1 {
 //
 //    @Resource
-//    private EdFileInfoServiceImpl edFileInfoServiceImpl;
-//    @Resource
-//    private FileSystemService fileSystemService;
-//
-//    @Value("${file.security.passwd}")
-//    private String password;
-//
-//    private String downloadDataDir = "";
-//    private String uploadDataDir = "";
-//
-//    @Resource
-//    private Environment environment;
-//
-//    @PostConstruct
-//    public void init() {
-//        String osName = System.getProperty("os.name").toLowerCase();
-//        uploadDataDir = osName.startsWith("win") ? environment.getProperty("data.upload.windows.tmp.path") : environment.getProperty("data.upload.linux.tmp.path");
-//        downloadDataDir = osName.startsWith("win") ? environment.getProperty("data.download.windows.tmp.path") : environment.getProperty("data.download.linux.tmp.path");
-//    }
+//    private EdPrjServiceImpl edPrjService;
 //
 //    @Test
-//    public void testImport() {
-//        String currentUserId = UserThreadLocal.getUserId();
-//        String destColibPath = "E:/tmp/测试沿用.colib";
-//        String mainName = FileUtil.mainName(destColibPath);
-//        String parentDir = FileUtil.getParent(destColibPath, 1);
-//        String zipDirPath = parentDir + File.separator + mainName + ".zip";
-//        AES aes = SecureUtil.aes(password.getBytes());
-//        try (
-//                InputStream inputStream = Files.newInputStream(Paths.get(destColibPath));
-//                OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath));
-//        ) {
-//            aes.decrypt(inputStream, outputStream, true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            String info = "文件上传错误";
-//            System.out.println("info = " + info);
-//        }
-//        String uuid = IdUtil.fastSimpleUUID();
-//        String tmpDir = uploadDataDir + currentUserId + File.separator + uuid + File.separator;
-//        ZipUtil.unzip(zipDirPath, tmpDir);
-//
-//        edFileInfoServiceImpl.update2Database(tmpDir);
-//        fileSystemService.deleteFile(zipDirPath, destColibPath);
-//
+//    public void testFollow() {
+//        String sourceId = "100101";
+//        String targetId = "100323";
+//        edPrjService.follow(sourceId, targetId);
 //    }
 //
 //}