From 2e2063d36f232f6b3e24947ea33787999586b109 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 21 十一月 2022 14:15:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index d36ecec..c659b0e 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -5,10 +5,7 @@
import com.lf.server.entity.ctrl.TabMapperEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
-import com.lf.server.helper.ClassHelper;
-import com.lf.server.helper.ExcelHelper;
-import com.lf.server.helper.FileHelper;
-import com.lf.server.helper.ZipHelper;
+import com.lf.server.helper.*;
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.all.BaseUploadService;
@@ -80,7 +77,11 @@
continue;
}
if (fileName.contains(MDB)) {
- list.add(new TabMapperEntity(fileName, "mdb", fileName));
+ //list.add(new TabMapperEntity(fileName, "mdb", fileName));
+ List<String> tabs = GdbHelper.getTabNames(f.getPath());
+ for (String tab : tabs) {
+ list.add(new TabMapperEntity(fileName, "mdb", tab, fileName));
+ }
continue;
}
if (fileName.contains(SHP_ZIP)) {
@@ -95,7 +96,7 @@
getGdbFiles(f.getName(), subPath, list);
continue;
}
- if (!fileName.contains(ZIP)){
+ if (!fileName.contains(ZIP)) {
//
}
}
@@ -144,15 +145,17 @@
/**
* 鑾峰彇Gdb鏂囦欢
*/
- private void getGdbFiles(String sourceName, String subPath, List<TabMapperEntity> list){
+ private void getGdbFiles(String sourceName, String subPath, List<TabMapperEntity> list) {
List<String> files = new ArrayList<>();
getGdbFiles(subPath, files);
String root = subPath.substring(0, subPath.lastIndexOf(File.separator) + 1);
for (String file : files) {
- String name = FileHelper.getFileName(file);
String path = file.replace(root, "");
- list.add(new TabMapperEntity(sourceName, "shp", name, path));
+ List<String> tabs = GdbHelper.getTabNames(file);
+ for (String tab : tabs) {
+ list.add(new TabMapperEntity(sourceName, "gdb", tab, path));
+ }
}
}
--
Gitblit v1.9.3