chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

层级沿用的问题

This commit is contained in:
chenxudong 2025-02-19 16:51:01 +08:00
parent 634dd42778
commit e34cf51900
2 changed files with 7 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
Map<String, EdFileInfo> sourceFileNameMap = sourceTmpEdFiles.stream() Map<String, EdFileInfo> sourceFileNameMap = sourceTmpEdFiles.stream()
.collect(Collectors.toMap(EdFileInfo::getFileName, e -> e)); .collect(Collectors.toMap(EdFileInfo::getFileName, e -> e));
// 获取target当前层级的子集名称 // 获取target当前层级的子集名称
List<String> targetFileNames = targetTmpEdFiles.stream() List<String> targetFileNames = targetEdFileInfos.stream()
.filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count) .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count)
.map(EdFileInfo::getFileName) .map(EdFileInfo::getFileName)
.collect(Collectors.toList()); .collect(Collectors.toList());

65
electrmangnetic/src/test/java/Test1.java
View File

@ -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.Application;
//import com.electromagnetic.industry.software.manage.service.FileSystemService; //import com.electromagnetic.industry.software.manage.service.serviceimpl.EdPrjServiceImpl;
//import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileInfoServiceImpl;
//import org.junit.jupiter.api.Test; //import org.junit.jupiter.api.Test;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.boot.test.context.SpringBootTest; //import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.core.env.Environment;
// //
//import javax.annotation.PostConstruct;
//import javax.annotation.Resource; //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) //@SpringBootTest(classes = Application.class)
//public class Test1 { //public class Test1 {
// //
// @Resource // @Resource
// private EdFileInfoServiceImpl edFileInfoServiceImpl; // private EdPrjServiceImpl edPrjService;
// @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");
// }
// //
// @Test // @Test
// public void testImport() { // public void testFollow() {
// String currentUserId = UserThreadLocal.getUserId(); // String sourceId = "100101";
// String destColibPath = "E:/tmp/测试沿用.colib"; // String targetId = "100323";
// String mainName = FileUtil.mainName(destColibPath); // edPrjService.follow(sourceId, targetId);
// 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);
//
// } // }
// //
//} //}