From e002c67732b571f0b20cca8321ca8ee1ddba2e05 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 14 八月 2023 17:05:23 +0800
Subject: [PATCH] 修改文件上传、GDB/Shp数据读取、数据入库、元数据管理等接口
---
src/main/java/com/moon/server/service/data/UploadService.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/moon/server/service/data/UploadService.java b/src/main/java/com/moon/server/service/data/UploadService.java
index bb5e2b4..2ecae47 100644
--- a/src/main/java/com/moon/server/service/data/UploadService.java
+++ b/src/main/java/com/moon/server/service/data/UploadService.java
@@ -1,15 +1,16 @@
package com.moon.server.service.data;
+import com.google.common.collect.Lists;
import com.moon.server.entity.all.BaseEntity;
import com.moon.server.entity.all.StaticData;
+import com.moon.server.entity.data.*;
import com.moon.server.entity.sys.UserEntity;
+import com.moon.server.helper.*;
import com.moon.server.mapper.all.BasicMapper;
import com.moon.server.mapper.data.UploadMapper;
import com.moon.server.service.all.BaseQueryService;
import com.moon.server.service.all.BaseUploadService;
import com.moon.server.service.sys.DepService;
-import com.moon.server.entity.data.*;
-import com.moon.server.helper.*;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -93,6 +94,9 @@
File f = new File(mf.getPath());
if (!f.exists()) {
mf.setMsg("鏂囦欢涓㈠け");
+ }
+ if (f.exists() && StringHelper.isNull(mf.getGuid())) {
+ mf.setGuid(FileHelper.getFileMd5(f.getPath()));
}
MetaEntity old = metaService.selectByGuid(mf.getGuid(), getDirCode(mf), null);
@@ -227,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;
}
/**
@@ -296,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())) {
@@ -425,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);
}
@@ -464,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