From 8c47e01a8f8bf20b668d92268b8bce6f61f22261 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 20:10:02 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 5ad6f44..9129888 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -26,18 +26,6 @@
*/
@Service
public class BaseUploadService {
- private final static String XLS = ".xls";
-
- private final static String MDB = ".mdb";
-
- private final static String GDB = ".gdb";
-
- private final static String SHP_ZIP = ".shp.zip";
-
- private final static String GDB_ZIP = ".gdb.zip";
-
- private final static String ZIP = ".zip";
-
@Autowired
public PathHelper pathHelper;
@@ -160,7 +148,9 @@
mf.setExtName(extName);
mf.setSizes(FileHelper.sizeToMb(f.length()));
mf.setPath(subPath + File.separator + fileName);
- // mf.setGuid(FileHelper.getFileMd5(f.getPath()))
+ if (!StaticData.ZIP.equals(extName)) {
+ mf.setGuid(FileHelper.getFileMd5(f.getPath()));
+ }
list.add(mf);
}
@@ -208,7 +198,7 @@
meta.setEpsgCode(epsgCode);
if (StaticData.ZIP.equals(meta.getExtName())) {
- List<MetaFileEntity> subs = getMappers(path, meta);
+ List<MetaFileEntity> subs = getMapperFiles(path, meta);
if (null != subs && subs.size() > 0) {
list.addAll(subs);
continue;
@@ -254,8 +244,38 @@
*/
private List<MetaFileEntity> getMapperFiles(File[] files, MetaFileEntity meta) {
List<MetaFileEntity> list = new ArrayList<>();
+ for (File f : files) {
+
+
+ String fileName = FileHelper.getFileName(f.getPath());
+ String extName = FileHelper.getExtension(fileName);
+ if (!StaticData.ALL_EXTENSION.contains(extName)) {
+ continue;
+ }
+
+ MetaFileEntity mf = createMetaFileEntity(meta);
+ mf.setName(fileName);
+ mf.setExtName(extName);
+ mf.setSizes(FileHelper.sizeToMb(f.length()));
+ //mf.setPath(subPath + File.separator + fileName);
+ mf.setGuid(FileHelper.getFileMd5(f.getPath()));
+ }
return list;
+ }
+
+ /**
+ * 鍒涘缓鍏冩暟鎹枃浠跺疄浣撶被
+ */
+ private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
+ MetaFileEntity mf = new MetaFileEntity();
+ mf.setDirid(meta.getDirid());
+ mf.setDepid(meta.getDepid());
+ mf.setVerid(meta.getVerid());
+ mf.setCreateUser(meta.getCreateUser());
+ mf.setEpsgCode(meta.getEpsgCode());
+
+ return mf;
}
/*private List<TabMapperEntity> getMappers(String zipPath, File[] files) {
@@ -366,7 +386,7 @@
}*/
private boolean isGdbFile(File f) {
- if (f.getName().toLowerCase().endsWith(GDB)) {
+ if (f.isDirectory() && f.getName().toLowerCase().endsWith(StaticData.GDB)) {
File[] files = f.listFiles();
if (null == files || files.length == 0) {
return false;
--
Gitblit v1.9.3