From 11d8cde28030e33b5406582d6310a00b8d78ad43 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 17:59:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 5fc80ad..c8353cb 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -193,7 +193,12 @@
/**
* 鏌ヨ鏄犲皠
*/
- public List<MetaFileEntity> selectMappers(UserEntity ue, List<MetaFileEntity> metas, DirEntity dir, VerEntity ver, String epsgCode) {
+ public List<MetaFileEntity> selectMappers(UserEntity ue, String path, DirEntity dir, VerEntity ver, String epsgCode) {
+ List<MetaFileEntity> metas = selectFiles(path, StaticData.ALL_EXTENSION);
+ if (null == metas || metas.isEmpty()) {
+ return null;
+ }
+
List<MetaFileEntity> list = new ArrayList<>();
for (MetaFileEntity meta : metas) {
meta.setDirid(dir.getId());
@@ -203,20 +208,34 @@
meta.setEpsgCode(epsgCode);
if (StaticData.ZIP.equals(meta.getExtName())) {
- List<MetaFileEntity> subs = getMappers(meta.getPath(), meta);
- if (subs.size() > 0) {
+ List<MetaFileEntity> subs = getMappers(path, meta.getPath(), meta);
+ if (null != subs && subs.size() > 0) {
list.addAll(subs);
+ continue;
}
- } else {
- meta.setEventid(StringHelper.getGuid());
- list.add(meta);
}
+
+ meta.setEventid(StringHelper.getGuid());
+ list.add(meta);
}
return list;
}
- private List<MetaFileEntity> getMappers(String zipPath, MetaFileEntity meta) {
+ /**
+ * 鑾峰彇鏄犲皠
+ */
+ private List<MetaFileEntity> getMappers(String path, String zipPath, MetaFileEntity meta) {
+ File file = new File(pathHelper.getConfig().getTempPath() + File.separator + zipPath);
+ if (!file.exists() || file.isDirectory()) {
+ return null;
+ }
+
+ File zipFolder = new File(pathHelper.getConfig().getTempPath() + File.separator + path + "_zip");
+ if (!zipFolder.exists() || !zipFolder.isDirectory()) {
+ zipFolder.mkdirs();
+ }
+
List<MetaFileEntity> list = new ArrayList<>();
--
Gitblit v1.9.3