From 056daa69d17b85f9825a14fdacd9fcfbc316c381 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 25 四月 2023 14:34:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 68118b5..7912b61 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);
+ MetaFileEntity xlsMeta = getExcelMetaEntity(list);
loadData(list);
copyFiles(list);
insertMetas(list);
- excelLoader(list, req);
+ if (null != xlsMeta) {
+ excelLoader(xlsMeta, req);
+ }
}
/**
@@ -101,14 +104,8 @@
/**
* Excel鍏ュ簱
*/
- private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
+ private String excelLoader(MetaFileEntity xlsMeta, HttpServletRequest req) {
try {
- List<MetaFileEntity> xlsList = getExcelFiles(list);
- if (xlsList.isEmpty()) {
- return null;
- }
-
- MetaFileEntity xlsMeta = getExcelMeta(xlsList);
String guid = fmeService.excelLoader(xlsMeta, req);
return guid;
@@ -119,12 +116,24 @@
}
/**
+ * 鑾峰彇Excel鍏冩暟鎹疄浣�
+ */
+ private MetaFileEntity getExcelMetaEntity(List<MetaFileEntity> list) {
+ List<MetaFileEntity> xlsList = getExcelFiles(list);
+ if (xlsList.isEmpty()) {
+ return null;
+ }
+
+ return getExcelMeta(xlsList);
+ }
+
+ /**
* 鑾峰彇Excel鍏冩暟鎹枃浠�
*/
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
for (MetaFileEntity mf : list) {
- if ("鎴愬姛".equals(mf.getMsg()) && isExcel(mf)) {
+ if (null != mf.getMsg() && isExcel(mf)) {
xlsList.add(mf);
}
}
--
Gitblit v1.9.3