From 24c7bd56407bcb603fb110bcc48128ab14a167d4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 10 一月 2023 20:32:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 9cd0672..17509af 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -213,6 +213,7 @@
list.add(meta);
}
+ setMetaType(list);
return list;
}
@@ -293,7 +294,7 @@
continue;
}
- int dirid = getDirByPath(f.getPath(), dir, dirs);
+ int dirid = getDirByPath(f.getPath(), fileName, dir, dirs);
boolean isShp = StaticData.SHP.equals(extName);
if (isGdb) {
List<MetaFileEntity> rs = getGdbMappers(f, meta, dirid, start);
@@ -342,7 +343,7 @@
/**
* 鏍规嵁鏂囦欢璺緞鑾峰彇鐩綍ID
*/
- private int getDirByPath(String filePath, DirEntity dir, List<DirEntity> dirs) {
+ private int getDirByPath(String filePath,String fileName, DirEntity dir, List<DirEntity> dirs) {
if (0 != dir.getPid() || null == dirs || dirs.isEmpty()) {
return dir.getId();
}
@@ -351,7 +352,7 @@
}
for (DirEntity entity : dirs) {
- if (filePath.contains(entity.getFullName())) {
+ if (filePath.contains(entity.getFullName() + "\\" + fileName)) {
return entity.getId();
}
}
@@ -485,6 +486,17 @@
}
/**
+ * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
+ */
+ private void setMetaType(List<MetaFileEntity> list) {
+ for (MetaFileEntity mf : list) {
+ if (null != mf.getExtName()) {
+ mf.setType(mf.getExtName().replace(".", ""));
+ }
+ }
+ }
+
+ /**
* 鑾峰彇鍙傛暟 *
* Enumeration<String> headers = req.getHeaderNames();
* Enumeration<String> attributes = req.getAttributeNames();
--
Gitblit v1.9.3