From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/all/UploadAttachService.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/UploadAttachService.java b/src/main/java/com/lf/server/service/all/UploadAttachService.java
index 53cb4b3..062f2c6 100644
--- a/src/main/java/com/lf/server/service/all/UploadAttachService.java
+++ b/src/main/java/com/lf/server/service/all/UploadAttachService.java
@@ -16,6 +16,7 @@
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.FileHeader;
import net.lingala.zip4j.model.ZipParameters;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@
private static String tabs = "''";
- private final static Map<String, String> ATTACH_TABS = new HashMap<>();
+ public final static Map<String, String> ATTACH_TABS = new HashMap<>();
private final static Log log = LogFactory.getLog(UploadAttachService.class);
@@ -268,27 +269,38 @@
return 0;
}
- Field field = getAnnexField(list.get(0), meta);
+ Field field = getAnnexField(list.get(0), meta.getTab());
String folder = meta.getName().split("\\.")[0].trim().toLowerCase() + File.separator;
int rows = 0;
for (Object obj : list) {
- String name = getAnnexName(obj, field);
- if (StringHelper.isEmpty(name)) {
+ String[] names = getNames(getAnnexName(obj, field));
+ if (null == names || names.length == 0) {
continue;
}
- String file = findAnnexFile(name, folder, files);
- if (null == file) {
- continue;
- }
+ for (String name : names) {
+ String file = findAnnexFile(name, folder, files);
+ if (null == file) {
+ continue;
+ }
- BaseEntity be = (BaseEntity) obj;
- rows += insertXlsAnnex(ue, meta, be, file);
- files.remove(file);
+ rows += insertXlsAnnex(ue, meta, (BaseEntity) obj, file);
+ }
}
return rows;
+ }
+
+ /**
+ * 鑾峰彇鍚嶇О
+ */
+ public static String[] getNames(String str) {
+ if (StringHelper.isEmpty(str)) {
+ return null;
+ }
+
+ return str.replace("锛�", ",").replace("锛�", ",").split(",");
}
/**
@@ -318,9 +330,9 @@
/**
* 鑾峰彇闄勪欢瀛楁
*/
- private Field getAnnexField(Object obj, MetaEntity meta) {
+ public static Field getAnnexField(Object obj, String tab) {
try {
- String str = ATTACH_TABS.get(meta.getTab());
+ String str = ATTACH_TABS.get(tab);
Field field = obj.getClass().getDeclaredField(str);
field.setAccessible(true);
@@ -334,7 +346,7 @@
/**
* 鑾峰彇闄勪欢鍚嶇О
*/
- private String getAnnexName(Object obj, Field field) {
+ public static String getAnnexName(Object obj, Field field) {
try {
Object val = field.get(obj);
@@ -375,7 +387,6 @@
String md5 = FileHelper.getFileMd5(file);
AttachEntity old = attachService.selectByTabAndGuid(meta.getTab(), be.getEventid(), md5);
if (null != old) {
- f.delete();
return 0;
}
@@ -385,10 +396,13 @@
AttachEntity ae = getAttachEntity(ue, meta.getTab(), be.getEventid(), fileName, md5, sizes);
String targetPath = pathHelper.getConfig().getUploadPath() + File.separator + ae.getPath();
- f.renameTo(new File(targetPath));
- int rows = attachService.insert(ae);
+ try {
+ FileUtils.copyFile(f, new File(targetPath));
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
- return rows > 0 ? 1 : 0;
+ return attachService.insert(ae);
}
/**
@@ -413,7 +427,7 @@
/**
* 璇锋眰涓嬭浇
*/
- public String downloadReqForGuids(UserEntity ue, String[] guids) {
+ public String downloadReqForGuids(UserEntity ue, List<String> guids) {
List<AttachEntity> list = attachService.selectByGuids(guids);
return downloadReq(ue, list);
@@ -422,7 +436,7 @@
/**
* 璇锋眰涓嬭浇
*/
- public String downloadReqForTabGuids(UserEntity ue, String tab, String[] guids) {
+ public String downloadReqForTabGuids(UserEntity ue, String tab, List<String> guids) {
List<AttachEntity> list = attachService.selectByTabGuids(tab, guids);
return downloadReq(ue, list);
@@ -440,7 +454,7 @@
String zipFile = pathHelper.getDownloadFullPath() + File.separator + zipName;
ZipFile zip = Zip4jHelper.createZipFile(zipFile, null);
- ZipParameters params = Zip4jHelper.getZipParams();
+ ZipParameters params = Zip4jHelper.getZipParams(false);
addZipFiles(zip, params, list);
DownloadEntity downloadEntity = getDownloadEntity(ue, zipFile, null);
@@ -481,7 +495,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡锛�7-闄勪欢
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡锛�7-闄勪欢鏂囦欢锛�8-鐡︾墖鏂囦欢
de.setType(7);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
--
Gitblit v1.9.3