From c8e5656bd1d02f66b9e6e159da56804f7c7da112 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 09:28:50 +0800
Subject: [PATCH] 12
---
src/main/java/com/lf/server/service/data/UploadService.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 3a39ba3..92f9304 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -228,13 +228,14 @@
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 = batchInserts(basicMapper, list);
@@ -248,7 +249,7 @@
/**
* 鎵归噺鎻掑叆
*/
- private <T> int batchInserts(BasicMapper basicMapper, List<T> list) {
+ 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);
@@ -315,6 +316,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())) {
@@ -444,15 +448,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);
}
@@ -483,15 +483,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.setMetaid(-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