From bb591378adb9cf33d8d7097b28bfd14027c3f2cc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 25 四月 2023 14:08:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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 50abe04..68118b5 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -66,13 +66,10 @@
*/
public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
- MetaFileEntity xlsMeta = getExcelMetaEntity(list);
loadData(list);
copyFiles(list);
insertMetas(list);
- if (null != xlsMeta) {
- excelLoader(xlsMeta, req);
- }
+ excelLoader(list, req);
}
/**
@@ -102,30 +99,23 @@
}
/**
- * 鑾峰彇Excel鍏冩暟鎹疄浣�
- */
- private MetaFileEntity getExcelMetaEntity(List<MetaFileEntity> list) {
- List<MetaFileEntity> xlsList = getExcelFiles(list);
- if (xlsList.isEmpty()) {
- return null;
- }
-
- return getExcelMeta(xlsList);
- }
-
- /**
* Excel鍏ュ簱
*/
- private String excelLoader(MetaFileEntity xlsMeta, HttpServletRequest req) {
- String guid;
+ private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
try {
- guid = fmeService.excelLoader(xlsMeta, req);
+ List<MetaFileEntity> xlsList = getExcelFiles(list);
+ if (xlsList.isEmpty()) {
+ return null;
+ }
+
+ MetaFileEntity xlsMeta = getExcelMeta(xlsList);
+ String guid = fmeService.excelLoader(xlsMeta, req);
+
+ return guid;
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
- guid = null;
+ return null;
}
-
- return guid;
}
/**
@@ -134,10 +124,7 @@
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
for (MetaFileEntity mf : list) {
- if (null != mf.getMsg()) {
- continue;
- }
- if (StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName()) || mf.getName().contains("WBS")) {
+ if ("鎴愬姛".equals(mf.getMsg()) && isExcel(mf)) {
xlsList.add(mf);
}
}
@@ -146,6 +133,13 @@
}
/**
+ * 鏄�/鍚︿负Excel
+ */
+ private boolean isExcel(MetaFileEntity mf) {
+ return StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName());
+ }
+
+ /**
* 鑾峰彇Excel鐨勫厓鏁版嵁
*/
private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
--
Gitblit v1.9.3