From 872bd1b076818750af70ff6966c0f9b0c11606ed Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 10 一月 2023 09:49:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 283f4af..9c978af 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -191,6 +191,7 @@
List<MetaFileEntity> list = new ArrayList<>();
for (MetaFileEntity meta : metas) {
+ meta.setEventid(StringHelper.getGuid());
meta.setDirid(dir.getId());
meta.setDepid(ue.getDepid());
meta.setVerid(ver.getId());
@@ -256,12 +257,24 @@
continue;
}
+ boolean isShp = StaticData.SHP.equals(extName);
+ if (isGdb) {
+ //
+ continue;
+ }
+
MetaFileEntity mf = createMetaFileEntity(meta);
mf.setName(fileName);
mf.setExtName(extName);
mf.setSizes(FileHelper.sizeToMb(f.length()));
mf.setPath(f.getPath().substring(subPath.length()));
- mf.setGuid(FileHelper.getFileMd5(f.getPath()));
+ if (isShp) {
+ mf.setTab(fileName);
+ //
+ } else {
+ mf.setGuid(FileHelper.getFileMd5(f.getPath()));
+ }
+ list.add(mf);
}
return list;
@@ -272,6 +285,7 @@
*/
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
+ mf.setEventid(StringHelper.getGuid());
mf.setDirid(meta.getDirid());
mf.setDepid(meta.getDepid());
mf.setVerid(meta.getVerid());
@@ -332,6 +346,20 @@
}
}
+ private void getGdbFiles(String sourceName, String subPath, List<TabMapperEntity> list) {
+ List<String> files = new ArrayList<>();
+ getGdbFiles(subPath, files);
+
+ String root = pathHelper.getConfig().getTempPath() + File.separator;
+ for (String file : files) {
+ String path = file.replace(root, "");
+ List<String> tabs = GdbHelper.getTabNames(file);
+ for (String tab : tabs) {
+ list.add(new TabMapperEntity(sourceName, "gdb", tab, path));
+ }
+ }
+ }*/
+
private void getShpFiles(String shpPath, List<String> list) {
File file = new File(shpPath);
@@ -348,20 +376,6 @@
if (f.getName().toLowerCase().endsWith(".shp")) {
list.add(f.getPath());
- }
- }
- }
-
- private void getGdbFiles(String sourceName, String subPath, List<TabMapperEntity> list) {
- List<String> files = new ArrayList<>();
- getGdbFiles(subPath, files);
-
- String root = pathHelper.getConfig().getTempPath() + File.separator;
- for (String file : files) {
- String path = file.replace(root, "");
- List<String> tabs = GdbHelper.getTabNames(file);
- for (String tab : tabs) {
- list.add(new TabMapperEntity(sourceName, "gdb", tab, path));
}
}
}
@@ -386,8 +400,11 @@
getGdbFiles(f.getPath(), list);
}
- }*/
+ }
+ /**
+ * 鏄�/鍚︿负GDB鏂囦欢
+ */
private boolean isGdbFile(File f) {
if (f.isDirectory() && f.getName().toLowerCase().endsWith(StaticData.GDB)) {
File[] files = f.listFiles();
--
Gitblit v1.9.3