From 3df6e8f9871f994dae931976d94f7cd5af5e3d6f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 10 一月 2023 14:37:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 111 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 39 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 62fb8d6..e4ce665 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -259,19 +259,26 @@
boolean isShp = StaticData.SHP.equals(extName);
if (isGdb) {
- String md5 = getGdbMd5(f.getPath());
+ List<MetaFileEntity> rs = getGdbMappers(f, meta, subPath);
+ if (null != rs && rs.size() > 0) {
+ list.addAll(rs);
+ }
continue;
}
MetaFileEntity mf = createMetaFileEntity(meta);
+ mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(extName);
- mf.setSizes(FileHelper.sizeToMb(f.length()));
mf.setPath(f.getPath().substring(subPath.length()));
+
if (isShp) {
+ List<String> shpFiles = getShpFiles(f.getPath());
mf.setTab(fileName);
- mf.setGuid(getShpMd5(f.getPath()));
+ mf.setSizes(getFilesSize(shpFiles));
+ mf.setGuid(getFilesMd5(shpFiles));
} else {
+ mf.setSizes(FileHelper.sizeToMb(f.length()));
mf.setGuid(FileHelper.getFileMd5(f.getPath()));
}
list.add(mf);
@@ -285,7 +292,6 @@
*/
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());
@@ -296,80 +302,107 @@
}
/**
- * 鑾峰彇SHP鏂囦欢鐨凪D5鐮�
+ * 鑾峰彇SHP鏂囦欢闆嗗悎
*/
- private String getShpMd5(String shpPath) {
- List<String> files = new ArrayList<>();
- files.add(shpPath);
+ private List<String> getShpFiles(String shpPath) {
+ List<String> list = new ArrayList<>();
+ list.add(shpPath);
for (int i = 1, c = StaticData.SHP_EXTENSION.size(); i < c; i++) {
String path = shpPath.replace(".shp", StaticData.SHP_EXTENSION.get(i));
File f = new File(path);
if (f.exists() && !f.isDirectory()) {
- files.add(path);
+ list.add(path);
}
}
- return getFilesMd5(files);
+ return list;
}
/**
- * 鑾峰彇GDB鏂囦欢鐨凪D5鐮�
+ * 鑾峰彇GDB鏂囦欢闆嗗悎
*/
- private String getGdbMd5(String path) {
+ private List<String> getGdbFiles(String path) {
+ List<String> list = new ArrayList<>();
+
File[] files = new File(path).listFiles();
if (null == files || files.length == 0) {
- return StringHelper.getGuid();
+ return list;
}
-
- List<String> list = new ArrayList<>();
for (File f : files) {
list.add(f.getPath());
}
- return getFilesMd5(list);
+ return list;
}
/**
* 鑾峰彇澶氭枃浠剁殑MD5
*/
- private String getFilesMd5(List<String> list) {
- StringBuilder sb = new StringBuilder();
- for (String str : list) {
- String md5 = FileHelper.getFileMd5(str);
+ private String getFilesMd5(List<String> files) {
+ List<String> list = new ArrayList<>();
+ for (String file : files) {
+ String md5 = FileHelper.getFileMd5(file);
if (null != md5) {
- sb.append(sb + ",");
+ list.add(md5);
}
}
- if (sb.length() > 0) {
- return FileHelper.getStringMd5(sb.toString());
+ if (list.size() > 0) {
+ String str = StringHelper.join(list, ",");
+ return FileHelper.getStringMd5(str);
}
return StringHelper.getGuid();
}
- private void getGdbFiles(String shpPath, List<String> list) {
- File file = new File(shpPath);
-
- File[] files = file.listFiles();
- if (null == files || files.length == 0) {
- return;
+ /**
+ * 鑾峰彇澶氭枃浠剁殑澶у皬
+ */
+ private double getFilesSize(List<String> files) {
+ long size = 0L;
+ for (String file : files) {
+ File f = new File(file);
+ if (f.exists() && !f.isDirectory()) {
+ size += f.length();
+ }
}
- for (File f : files) {
- if (!f.isDirectory()) {
- continue;
- }
+ return FileHelper.sizeToMb(size);
+ }
- if (isGdbFile(f)) {
- list.add(f.getPath());
- continue;
- }
-
- getGdbFiles(f.getPath(), list);
+ /**
+ * 鑾峰彇GDB鏂囦欢鏄犲皠
+ */
+ private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, String subPath) {
+ List<String> tabs = GdbHelper.getTabNames(f.getPath());
+ if (null == tabs || tabs.size() == 0) {
+ return null;
}
+
+ String fileName = FileHelper.getFileName(f.getPath());
+ String extName = FileHelper.getExtension(fileName);
+
+ List<String> gdbFiles = getGdbFiles(f.getPath());
+ String md5 = getFilesMd5(gdbFiles);
+ double sizes = getFilesSize(gdbFiles);
+
+ List<MetaFileEntity> list = new ArrayList<>();
+ for (String tab : tabs) {
+ MetaFileEntity mf = createMetaFileEntity(meta);
+ mf.setEventid(StringHelper.getGuid());
+ mf.setName(fileName);
+ mf.setExtName(extName);
+ mf.setSizes(FileHelper.sizeToMb(f.length()));
+ mf.setPath(f.getPath().substring(subPath.length()));
+ mf.setTab(tab);
+ mf.setSizes(sizes);
+ mf.setGuid(md5);
+ list.add(mf);
+ }
+
+ return list;
}
/**
--
Gitblit v1.9.3