From 54283d6b0fdd3bc1b444e5a9556ca3a740125b5b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 三月 2023 12:42:09 +0800
Subject: [PATCH] 2
---
src/main/java/com/lf/server/service/show/DataLibService.java | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index 62c769d..c7208b0 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -1,6 +1,7 @@
package com.lf.server.service.show;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -178,23 +179,6 @@
}
/**
- * 娣诲姞Zip鏂囦欢
- */
- private void addZipFiles(ZipFile zip, ZipParameters params, File[] files) {
- if (null == files || files.length == 0) {
- return;
- }
-
- for (File f : files) {
- try {
- zip.addFile(f, params);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
- }
-
- /**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) {
@@ -250,29 +234,38 @@
Map<String, List<?>> map = new HashMap<>(1);
map.put(name, list);
- return zipData(ue, map, pwd);
+ return zipData(ue, map, annex, pwd);
}
/**
* 鎵撳寘鏁版嵁
*/
- private String zipData(UserEntity ue, Map<String, List<?>> map, String pwd) throws Exception {
+ private String zipData(UserEntity ue, Map<String, List<?>> map, List<AttachEntity> annex, String pwd) throws Exception {
String tempName = StringHelper.YMDHMS2_FORMAT.format(new Date());
String tempPath = pathHelper.getTempPath(tempName);
- String filePath = tempPath + File.separator + tempName + ".gdb";
+ String gdbPath = tempPath + File.separator + tempName + ".gdb";
+ String annexPath = tempPath + File.separator + "annex";
- File file = new File(filePath);
+ File file = new File(gdbPath);
if (file.exists() && file.isDirectory()) {
- FileHelper.deleteDir(filePath);
+ FileHelper.deleteDir(gdbPath);
}
- GdbHelper.createGdb(filePath, map);
+ file = new File(annexPath);
+ if (!file.exists() || !file.isDirectory()) {
+ file.mkdirs();
+ }
+
+ GdbHelper.createGdb(gdbPath, map);
+ createAnnex(annexPath, annex);
String zipName = tempName + ".gdb.zip";
String zipFile = pathHelper.getDownloadFullPath() + File.separator + zipName;
ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
ZipParameters params = Zip4jHelper.getZipParams(true);
- addZipFiles(zip, params, file.listFiles());
+ // addZipFiles(zip, params, file.listFiles())
+ zip.addFolder(new File(gdbPath), params);
+ zip.addFolder(new File(annexPath), params);
String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
DownloadEntity downloadEntity = getDownloadEntity(ue, zipFile, dbPwd);
@@ -350,14 +343,61 @@
}
/**
+ * 娣诲姞Zip鏂囦欢
+ */
+ private void addZipFiles(ZipFile zip, ZipParameters params, File[] files) {
+ if (null == files || files.length == 0) {
+ return;
+ }
+
+ for (File f : files) {
+ try {
+ zip.addFile(f, params);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+ }
+
+ /**
* 鑾峰彇鏌ヨ闄勪欢鏉′欢
*/
- private static String getAnnexFilter(boolean flag, List<?> list) {
+ private String getAnnexFilter(boolean flag, List<?> list) {
if (flag) {
return null;
}
+ List<Integer> gids = new ArrayList<>();
+ for (Object obj : list) {
+ BaseEntity be = (BaseEntity) obj;
+ gids.add(be.getGid());
+ }
- return "";
+ return StringHelper.join(gids, ",");
+ }
+
+ /**
+ * 娣诲姞闄勪欢鏂囦欢
+ */
+ private void createAnnex(String targetPath, List<AttachEntity> list) {
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ int i = 1;
+ String uploadPath = pathHelper.getConfig().getUploadPath();
+ for (AttachEntity attach : list) {
+ try {
+ File srcFile = new File(uploadPath + File.separator + attach.getPath());
+ if (!srcFile.exists() || srcFile.isDirectory()) {
+ continue;
+ }
+
+ File destFile = new File(targetPath + File.separator + i++ + "_" + attach.getName());
+ FileHelper.copyFile(srcFile, destFile);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
}
}
--
Gitblit v1.9.3