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 | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 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 63371bd..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
@@ -71,7 +73,7 @@
copyFiles(list);
insertMetas(list);
if (xlsList.size() > 0) {
- excelLoader(xlsList, req);
+ String guid = excelLoader(xlsList, req);
}
}
@@ -93,12 +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("宸插瓨鍦�");
}
}
+ }
+
+ /**
+ * 鑾峰彇鐩綍缂栫爜
+ */
+ private String getDirCode(MetaFileEntity mf) {
+ if (StringHelper.isEmpty(mf.getDircode())) {
+ return null;
+ }
+
+ return StringHelper.getRightLike(mf.getDircode().substring(0, 2));
}
/**
@@ -107,9 +123,12 @@
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
for (MetaFileEntity mf : list) {
- if (null != mf.getMsg() && isExcel(mf)) {
+ if (null == mf.getMsg() && isExcel(mf)) {
xlsList.add(mf);
}
+ }
+ if (xlsList.isEmpty()) {
+ return xlsList;
}
String xlsBasePath = getXlsPath(xlsList.get(0).getPath());
@@ -204,7 +223,7 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), getDirCode(mf), tabName);
if (null != old) {
mf.setMsg("宸插瓨鍦�");
return;
@@ -212,21 +231,40 @@
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;
}
/**
@@ -282,6 +320,9 @@
case StaticData.SHP:
copyMultiFile(mf, StaticData.SHP_EXT);
break;
+ case StaticData.OSGB:
+ copyFolderFile(mf);
+ break;
case StaticData.GDB:
if (gdbList.contains(mf.getPath())) {
String path = findPathByGuid(list, mf);
@@ -311,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;
}
@@ -333,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());
}
/**
@@ -380,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;
}
@@ -398,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);
}
@@ -437,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) : "澶辫触");
}
}
--
Gitblit v1.9.3