From bf9f5d506d34cbbcc68f77cdf71e30a6cf3cd7d4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 13:50:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 260 ++++++++++++++++++++++++++++-----------------------
1 files changed, 143 insertions(+), 117 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 5c05c6b..bd0c0af 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.data;
+import com.google.common.collect.Lists;
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.*;
@@ -22,6 +23,7 @@
/**
* 鏁版嵁涓婁紶鏈嶅姟绫�
+ *
* @author WWW
*/
@Service
@@ -66,10 +68,13 @@
*/
public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
- excelLoader(list, req);
+ List<MetaFileEntity> xlsList = getExcelFiles(list);
loadData(list);
copyFiles(list);
insertMetas(list);
+ if (xlsList.size() > 0) {
+ String guid = excelLoader(xlsList, req);
+ }
}
/**
@@ -90,32 +95,26 @@
if (!f.exists()) {
mf.setMsg("鏂囦欢涓㈠け");
}
+ if (f.exists() && StringHelper.isNull(mf.getGuid())) {
+ mf.setGuid(FileHelper.getFileMd5(f.getPath()));
+ }
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), getDirCode(mf), null);
if (null != old) {
- mf.setMsg("宸插叆搴�");
+ mf.setMsg("宸插瓨鍦�");
}
}
}
/**
- * Excel鍏ュ簱
+ * 鑾峰彇鐩綍缂栫爜
*/
- private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
- List<MetaFileEntity> xlsList = getExcelFiles(list);
- if (xlsList.isEmpty()) {
- return "";
+ private String getDirCode(MetaFileEntity mf) {
+ if (StringHelper.isEmpty(mf.getDircode())) {
+ return null;
}
- String guid = null;
- try {
- MetaFileEntity meta = getExcelMeta(xlsList);
- guid = fmeService.excelLoader(meta, req);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
-
- return guid;
+ return StringHelper.getRightLike(mf.getDircode().substring(0, 2));
}
/**
@@ -124,48 +123,29 @@
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 (null == mf.getMsg() && isExcel(mf)) {
xlsList.add(mf);
}
+ }
+ if (xlsList.isEmpty()) {
+ return xlsList;
+ }
+
+ 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;
}
/**
- * 鑾峰彇Excel鐨勫厓鏁版嵁
+ * 鏄�/鍚︿负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;
+ private boolean isExcel(MetaFileEntity mf) {
+ return StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName());
}
/**
@@ -243,29 +223,48 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), getDirCode(mf), tabName);
if (null != old) {
- mf.setMsg("宸插叆搴�");
+ mf.setMsg("宸插瓨鍦�");
return;
}
List<?> list;
if (StaticData.SHP.equals(mf.getExtName())) {
- list = ShpHelper.readData(clazz, mf.getPath());
+ list = ShpHelper.readData(clazz, mf.getPath(), true);
} else {
- list = GdbHelper.readData(clazz, mf.getPath(), mf.getTab());
+ list = GdbHelper.readData(clazz, mf.getPath(), mf.getTab(), true);
}
if (null == list || list.isEmpty()) {
return;
}
+ mf.setRecords(list.size());
setCreateInfo(list, mf);
- int rows = basicMapper.insertBatch(list);
+ int rows = batchInserts(basicMapper, list);
if (rows > 0) {
mf.setEntity(mf.getTab());
mf.setTab(tabName);
mf.setRows(rows);
}
+ }
+
+ /**
+ * 鎵归噺鎻掑叆
+ */
+ private <T> int batchInserts(BasicMapper basicMapper, List<T> list) {
+ int rows = 0;
+ //int count = (int) Math.ceil(list.size() / StaticData.D100)
+ List<List<T>> subLists = Lists.partition(list, StaticData.I50);
+ for (List<T> sub : subLists) {
+ try {
+ rows += basicMapper.insertBatch(sub);
+ } catch (Exception ex) {
+ log.error(ex);
+ }
+ }
+
+ return rows;
}
/**
@@ -306,6 +305,9 @@
case StaticData.MPT:
copyMultiFile(mf, StaticData.MPT_EXT);
break;
+ case StaticData.JPG:
+ copyMultiFile(mf, StaticData.JPG_EXT);
+ break;
case StaticData.IMG:
copyMultiFile(mf, StaticData.IMG_EXT);
break;
@@ -317,6 +319,9 @@
break;
case StaticData.SHP:
copyMultiFile(mf, StaticData.SHP_EXT);
+ break;
+ case StaticData.OSGB:
+ copyFolderFile(mf);
break;
case StaticData.GDB:
if (gdbList.contains(mf.getPath())) {
@@ -347,9 +352,10 @@
return -1;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null, null);
if (null != old) {
- mf.setMsg("宸插叆搴�");
+ // mf.setMsg("宸插瓨鍦�")
+ setOldMeta(mf, old);
file.delete();
return 0;
}
@@ -369,6 +375,16 @@
mf.setPath(subPath);
return 1;
+ }
+
+ /**
+ * 璁剧疆鏃у厓鏁版嵁淇℃伅
+ */
+ private void setOldMeta(MetaFileEntity mf, MetaEntity old) {
+ mf.setPath(old.getPath());
+ mf.setTab(old.getTab());
+ mf.setRows(old.getRows());
+ mf.setEntity(old.getEventid());
}
/**
@@ -416,9 +432,10 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null, null);
if (null != old) {
- mf.setMsg("宸插叆搴�");
+ // mf.setMsg("宸插瓨鍦�")
+ setOldMeta(mf, old);
FileHelper.deleteFiles(file);
return;
}
@@ -434,15 +451,11 @@
return;
}
- newFile.mkdirs();
- File[] files = file.listFiles();
- if (null == files || files.length == 0) {
- return;
- }
-
- for (File f : files) {
- String subFile = targetPath + File.separator + FileHelper.getFileName(f.getPath());
- f.renameTo(new File(subFile));
+ try {
+ // newFile.mkdirs()
+ FileUtils.moveDirectory(file, newFile);
+ } catch (Exception ex) {
+ log.error(ex);
}
mf.setPath(subPath);
}
@@ -461,53 +474,6 @@
}
/**
- * 鍙戝竷鏂囦欢
- */
- private void publishFiles(List<MetaFileEntity> list) {
- for (MetaFileEntity mf : list) {
- if (null != mf.getMsg()) {
- continue;
- }
- switch (mf.getExtName()) {
- case StaticData.MPT:
- linkFiles(mf, StaticData.MPT_EXT, pathHelper.getConfig().getUploadPath() + File.separator + "SG");
- break;
- case StaticData.D3DML:
- linkFiles(mf, null, pathHelper.getConfig().getUploadPath() + File.separator + "SG");
- break;
- default:
- break;
- }
- }
- }
-
- /**
- * 閾炬帴鏂囦欢
- */
- private void linkFiles(MetaFileEntity mf, List<String> exts, String publishPath) {
- String uploadPath = pathHelper.getConfig().getUploadPath();
- String source = uploadPath + File.separator + mf.getPath();
- String target = publishPath + File.separator + mf.getName();
-
- File sourceFile = new File(source);
- if (!sourceFile.exists() || sourceFile.isDirectory()) {
- return;
- }
-
- createFileLink(source, target);
- if (null == exts) {
- return;
- }
-
- for (String ext : exts) {
- File f = new File(source.replace(mf.getExtName(), ext));
- if (f.exists() && !f.isDirectory()) {
- createFileLink(source.replace(mf.getExtName(), ext), target.replace(mf.getExtName(), ext));
- }
- }
- }
-
- /**
* 鍒涘缓鏂囦欢閾炬帴
*/
private void createFileLink(String source, String target) {
@@ -520,15 +486,25 @@
*/
private void insertMetas(List<MetaFileEntity> list) {
int metaId = insertParentMeta(list);
+
+ List<String> guids = new ArrayList<>();
for (MetaFileEntity mf : list) {
if (null != mf.getMsg()) {
continue;
}
MetaEntity me = createMeta(mf, metaId);
- metaService.insert(me);
+ if (StaticData.NGDB.equals(me.getType())) {
+ if (guids.contains(me.getGuid())) {
+ me.setIsmeta((short)-1);
+ } else {
+ guids.add(me.getGuid());
+ }
+ }
- mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+ metaService.insert(me);
+ String err = mf.getRows() < mf.getRecords() ? "(" + (mf.getRecords() - mf.getRows()) + " 鏉″け璐�)" : "";
+ mf.setMsg(me.getId() > 0 ? String.format("鎴愬姛%s", err) : "澶辫触");
}
}
@@ -579,4 +555,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