From ef750a9e4f4382ebcc508fe433f3afe044d426fc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 05 二月 2023 16:53:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/UploadAttachService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 6e94fea..2c67214 100644
--- a/src/main/java/com/lf/server/service/all/UploadAttachService.java
+++ b/src/main/java/com/lf/server/service/all/UploadAttachService.java
@@ -125,7 +125,7 @@
entity.setName(oldName);
entity.setTab(tab);
entity.setGuid(md5);
- String subPath = PathHelper.getUploadPath() + File.separator + md5;
+ String subPath = PathHelper.getUploadPath() + File.separator + md5 + FileHelper.getExtension(oldName);
entity.setPath(subPath);
entity.setSizes(sizes);
if (ue != null) {
@@ -167,7 +167,7 @@
/**
* 涓婁紶Excel闄勪欢
*/
- public List<KeyValueEntity> uploadXlsAnnex(List<MetaEntity> ms, List<MetaFileEntity> list, String path) {
+ public List<KeyValueEntity> uploadXlsAnnex(UserEntity ue, List<MetaEntity> ms, List<MetaFileEntity> list, String path) {
List<String> files = getAttachFiles(list, path);
if (files.size() == 0) {
return null;
@@ -175,7 +175,7 @@
List<KeyValueEntity> rs = new ArrayList<>();
for (MetaEntity meta : ms) {
- int rows = uploadXlsAnnex(meta, files);
+ int rows = uploadXlsAnnex(ue, meta, files);
rs.add(new KeyValueEntity(meta.getName(), String.valueOf(rows)));
}
@@ -253,14 +253,14 @@
/**
* 涓婁紶Excel闄勪欢
*/
- private int uploadXlsAnnex(MetaEntity meta, List<String> files) {
+ private int uploadXlsAnnex(UserEntity ue, MetaEntity meta, List<String> files) {
List<?> list = queryXlsData(meta);
if (null == list || list.size() == 0) {
return 0;
}
Field field = getAnnexField(list.get(0), meta);
- String folder = meta.getName().split(".")[0].trim().toLowerCase() + File.separator;
+ String folder = meta.getName().split("\\.")[0].trim().toLowerCase() + File.separator;
int rows = 0;
for (Object obj : list) {
@@ -275,7 +275,7 @@
}
BaseEntity be = (BaseEntity) obj;
- rows += insertXlsAnnex(be, files);
+ rows += insertXlsAnnex(ue, be, files, file);
}
return rows;
@@ -338,7 +338,7 @@
* 鏌ユ壘闄勪欢鏂囦欢
*/
private String findAnnexFile(String name, String folder, List<String> files) {
- name = File.separator + name.split(".")[0].toLowerCase();
+ name = File.separator + name.split("\\.")[0].trim().toLowerCase();
for (String file : files) {
if (file.toLowerCase().contains(folder) && file.toLowerCase().contains(name)) {
return file;
@@ -356,8 +356,27 @@
/**
* 鎻掑叆Excel闄勪欢
*/
- private int insertXlsAnnex(BaseEntity be, List<String> files) {
+ private int insertXlsAnnex(UserEntity ue, BaseEntity be, List<String> files, String file) {
+
+
+ files.remove(file);
return 1;
}
+
+ private AttachEntity getAttachEntity(UserEntity ue, String file) {
+ AttachEntity entity = new AttachEntity();
+// entity.setTab(tabName);
+// entity.setTabGuid(eventid);
+// entity.setName(fileName);
+// entity.setGuid(md5);
+// String subPath = PathHelper.getUploadPath() + File.separator + md5+ FileHelper.getExtension(fileName);
+// entity.setPath(subPath);
+// entity.setSizes(sizes);
+// if (ue != null) {
+// entity.setCreateUser(ue.getId());
+// }
+
+ return entity;
+ }
}
--
Gitblit v1.9.3