From 6b47d0b118726246997167cdd9d39fe5e21f17b6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 25 四月 2023 15:23:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 122 ++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 62 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 7eaa58f..63371bd 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -66,12 +66,12 @@
*/
public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
- MetaFileEntity xlsMeta = getExcelMetaEntity(list);
+ List<MetaFileEntity> xlsList = getExcelFiles(list);
loadData(list);
copyFiles(list);
insertMetas(list);
- if (null != xlsMeta) {
- excelLoader(xlsMeta, req);
+ if (xlsList.size() > 0) {
+ excelLoader(xlsList, req);
}
}
@@ -102,32 +102,6 @@
}
/**
- * Excel鍏ュ簱
- */
- private String excelLoader(MetaFileEntity xlsMeta, HttpServletRequest req) {
- try {
- String guid = fmeService.excelLoader(xlsMeta, req);
-
- return guid;
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- return null;
- }
- }
-
- /**
- * 鑾峰彇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) {
@@ -138,6 +112,13 @@
}
}
+ String xlsBasePath = getXlsPath(xlsList.get(0).getPath());
+ for (int i = 0, c = xlsList.size(); i < c; i++) {
+ MetaFileEntity mf = xlsList.get(i);
+ String xlsPath = copyXlsFile(xlsBasePath, i, mf);
+ mf.setXlsPath(xlsPath);
+ }
+
return xlsList;
}
@@ -146,39 +127,6 @@
*/
private boolean isExcel(MetaFileEntity mf) {
return StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName());
- }
-
- /**
- * 鑾峰彇Excel鐨勫厓鏁版嵁
- */
- private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
- List<String> pathList = new ArrayList<>();
- List<String> dirList = new ArrayList<>();
- List<String> pidList = new ArrayList<>();
-
- String xlsBasePath = getXlsPath(xlsList.get(0).getPath());
- for (int i = 0, c = xlsList.size(); i < c; i++) {
- MetaFileEntity mf = xlsList.get(i);
-
- String path = copyXlsFile(xlsBasePath, i, mf);
- if (null != path) {
- pathList.add(path);
- dirList.add(mf.getDircode());
- pidList.add(mf.getEventid());
- }
- }
-
- MetaFileEntity first = xlsList.get(0);
- MetaFileEntity meta = new MetaFileEntity();
- meta.setPath(StringHelper.join(pathList, ","));
- meta.setEpsgCode(first.getEpsgCode());
- meta.setName(StringHelper.join(dirList, ";"));
- meta.setDepcode(first.getDepcode());
- meta.setVerid(first.getVerid());
- meta.setCreateUser(first.getCreateUser());
- meta.setEventid(StringHelper.join(pidList, ";"));
-
- return meta;
}
/**
@@ -548,4 +496,54 @@
return 0;
}
+
+ /**
+ * Excel鍏ュ簱
+ */
+ private String excelLoader(List<MetaFileEntity> xlsList, HttpServletRequest req) {
+ try {
+ MetaFileEntity xlsMeta = getExcelMeta(xlsList);
+ if (null != xlsMeta) {
+ return fmeService.excelLoader(xlsMeta, req);
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+
+ return null;
+ }
+
+ /**
+ * 鑾峰彇Excel鐨勫厓鏁版嵁
+ */
+ private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
+ if (null == xlsList || xlsList.isEmpty()) {
+ return null;
+ }
+
+ List<String> pathList = new ArrayList<>();
+ List<String> dirList = new ArrayList<>();
+ List<String> pidList = new ArrayList<>();
+
+ for (int i = 0, c = xlsList.size(); i < c; i++) {
+ MetaFileEntity mf = xlsList.get(i);
+ if ("鎴愬姛".equals(mf.getMsg()) && null != mf.getXlsPath()) {
+ pathList.add(mf.getXlsPath());
+ dirList.add(mf.getDircode());
+ pidList.add(mf.getEventid());
+ }
+ }
+
+ MetaFileEntity first = xlsList.get(0);
+ MetaFileEntity meta = new MetaFileEntity();
+ meta.setPath(StringHelper.join(pathList, ","));
+ meta.setEpsgCode(first.getEpsgCode());
+ meta.setName(StringHelper.join(dirList, ";"));
+ meta.setDepcode(first.getDepcode());
+ meta.setVerid(first.getVerid());
+ meta.setCreateUser(first.getCreateUser());
+ meta.setEventid(StringHelper.join(pidList, ";"));
+
+ return meta;
+ }
}
--
Gitblit v1.9.3