From 584cab861940bf212245494225f17cc87bc37134 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 19 四月 2023 11:30:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 209803e..50abe04 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -66,10 +66,13 @@
*/
public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
- excelLoader(list, req);
+ MetaFileEntity xlsMeta = getExcelMetaEntity(list);
loadData(list);
copyFiles(list);
insertMetas(list);
+ if (null != xlsMeta) {
+ excelLoader(xlsMeta, req);
+ }
}
/**
@@ -99,20 +102,30 @@
}
/**
- * Excel鍏ュ簱
+ * 鑾峰彇Excel鍏冩暟鎹疄浣�
*/
- private void excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
+ private MetaFileEntity getExcelMetaEntity(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = getExcelFiles(list);
if (xlsList.isEmpty()) {
- return;
+ return null;
}
+ return getExcelMeta(xlsList);
+ }
+
+ /**
+ * Excel鍏ュ簱
+ */
+ private String excelLoader(MetaFileEntity xlsMeta, HttpServletRequest req) {
+ String guid;
try {
- MetaFileEntity meta = getExcelMeta(xlsList);
- String guid = fmeService.excelLoader(meta, req);
+ guid = fmeService.excelLoader(xlsMeta, req);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
+ guid = null;
}
+
+ return guid;
}
/**
@@ -461,7 +474,7 @@
}
/**
- * 鍙戝竷鏂囦欢
+ * 鍙戝竷鏂囦欢 *
*/
private void publishFiles(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
--
Gitblit v1.9.3