From 41203a65b9956fcd99c663b427dd60ecb9a93a85 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 11 一月 2023 10:27:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 8743472..c237c9b 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -9,7 +9,6 @@
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.data.UploadMapper;
import com.lf.server.service.all.BaseUploadService;
-import org.apache.commons.collections4.queue.PredicatedQueue;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,7 +54,18 @@
*/
public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
- loadExcel(list, req);
+ dataLoader(list);
+ excelLoader(list, req);
+ }
+
+ /**
+ * 瑁呰浇鏁版嵁
+ *
+ * @param list
+ */
+ private void dataLoader(List<MetaFileEntity> list) {
+
+
}
/**
@@ -79,14 +89,21 @@
/**
* Excel鍏ュ簱
*/
- private void loadExcel(List<MetaFileEntity> list, HttpServletRequest req) {
+ private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
List<MetaFileEntity> xlsList = getExcelFiles(list);
if (xlsList.isEmpty()) {
- return;
+ return "";
}
- MetaFileEntity meta = getExcelMeta(xlsList);
- String guid = fmeService.excelLoader(meta, req);
+ String guid = null;
+ try {
+ MetaFileEntity meta = getExcelMeta(xlsList);
+ guid = fmeService.excelLoader(meta, req);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+
+ return guid;
}
/**
--
Gitblit v1.9.3