From d5c36090a84b75395fc3f33661c5d7007a6907c5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 27 二月 2024 13:43:02 +0800
Subject: [PATCH] 集中设置目录编码
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 74 +++++++++++++++++-------------------
1 files changed, 35 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 9cf9aba..2290e01 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -196,26 +196,24 @@
}
List<MetaFileEntity> list = new ArrayList<>();
- List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
for (MetaFileEntity meta : metas) {
meta.setEventid(StringHelper.getGuid());
- meta.setDircode(dir.getCode());
meta.setDepcode(ue.getDepcode());
meta.setVerid(ver.getId());
meta.setCreateUser(ue.getId());
meta.setEpsgCode(epsgCode);
if (StaticData.ZIP.equals(meta.getExtName())) {
- List<MetaFileEntity> subs = getMapperFiles(path, dir, dirs, meta);
+ List<MetaFileEntity> subs = getMapperFiles(path, meta);
if (null != subs && subs.size() > 0) {
list.addAll(subs);
continue;
}
}
-
list.add(meta);
}
setMetaType(list);
+ setDircode(list, dir);
return list;
}
@@ -223,7 +221,7 @@
/**
* 鑾峰彇鏄犲皠鏂囦欢
*/
- private List<MetaFileEntity> getMapperFiles(String path, DirEntity dir, List<DirEntity> dirs, MetaFileEntity meta) {
+ private List<MetaFileEntity> getMapperFiles(String path, MetaFileEntity meta) {
String tempPath = pathHelper.getConfig().getTempPath();
String zipFile = tempPath + File.separator + meta.getPath();
File file = new File(zipFile);
@@ -243,7 +241,7 @@
List<File> files = new ArrayList<>();
getFilesByPath(files, subPath);
- return getMapperFiles(files, dir, dirs, meta, tempPath.length() + 1);
+ return getMapperFiles(files, meta, tempPath.length() + 1);
}
/**
@@ -300,7 +298,7 @@
/**
* 鑾峰彇鏄犲皠鏂囦欢
*/
- private List<MetaFileEntity> getMapperFiles(List<File> files, DirEntity dir, List<DirEntity> dirs, MetaFileEntity meta, int start) {
+ private List<MetaFileEntity> getMapperFiles(List<File> files, MetaFileEntity meta, int start) {
List<MetaFileEntity> list = new ArrayList<>();
for (File f : files) {
boolean isGdb = isGdbFile(f);
@@ -316,22 +314,20 @@
continue;
}
- String dircode = getDirByPath(f.getPath(), fileName, dir, dirs);
if (isGdb) {
- List<MetaFileEntity> rs = getGdbMappers(f, meta, dircode, start);
+ List<MetaFileEntity> rs = getGdbMappers(f, meta, start);
if (null != rs && rs.size() > 0) {
list.addAll(rs);
}
continue;
}
if (isOsgb) {
- list.add(getOsgbMapper(f, meta, dircode, start));
+ list.add(getOsgbMapper(f, meta, start));
continue;
}
MetaFileEntity mf = createMetaFileEntity(f, meta, fileName, extName);
mf.setPath(f.getPath().substring(start));
- mf.setDircode(dircode);
list.add(mf);
}
@@ -367,35 +363,12 @@
*/
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
- mf.setDircode(meta.getDircode());
mf.setDepcode(meta.getDepcode());
mf.setVerid(meta.getVerid());
mf.setCreateUser(meta.getCreateUser());
mf.setEpsgCode(meta.getEpsgCode());
return mf;
- }
-
- /**
- * 鏍规嵁鏂囦欢璺緞鑾峰彇鐩綍ID
- */
- private String getDirByPath(String filePath,String fileName, DirEntity dir, List<DirEntity> dirs) {
- if (0 != dir.getPid() || null == dirs || dirs.isEmpty()) {
- return dir.getCode();
- }
- if (StaticData.SLASH.equals(File.separator)) {
- filePath = filePath.replace("/", "\\");
- }
-
- fileName = fileName.toLowerCase();
- filePath = filePath.toLowerCase();
- for (DirEntity entity : dirs) {
- if (filePath.contains(entity.getFullName().toLowerCase() + "\\" + fileName)) {
- return entity.getCode();
- }
- }
-
- return dir.getCode();
}
/**
@@ -472,7 +445,7 @@
/**
* 鑾峰彇GDB鏂囦欢鏄犲皠
*/
- private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, String dircode, int start) {
+ private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, int start) {
List<String> tabs = GdbHelper.getTabNames(f.getPath());
if (null == tabs || tabs.size() == 0) {
return null;
@@ -488,7 +461,6 @@
List<MetaFileEntity> list = new ArrayList<>();
for (String tab : tabs) {
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName + "\\" + tab);
mf.setExtName(extName);
@@ -551,11 +523,10 @@
return false;
}
-
/**
* 鑾峰彇OSGB鏂囦欢鏄犲皠
*/
- private MetaFileEntity getOsgbMapper(File f, MetaFileEntity meta, String dircode, int start) {
+ private MetaFileEntity getOsgbMapper(File f, MetaFileEntity meta, int start) {
String fileName = FileHelper.getFileName(f.getPath());
List<String> files = new ArrayList<>();
@@ -565,7 +536,6 @@
double sizes = getFilesSize(files);
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(StaticData.OSGB);
@@ -578,6 +548,32 @@
}
/**
+ * 璁剧疆鐩綍缂栫爜
+ */
+ private void setDircode(List<MetaFileEntity> list, DirEntity dir) {
+ List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
+ if (null == dirs || dirs.isEmpty()) {
+ for (MetaFileEntity mfe : list) {
+ mfe.setDircode(dir.getCode());
+ }
+ return;
+ }
+
+ for (MetaFileEntity mfe : list) {
+ String code= dir.getCode();
+ String fileName = mfe.getName().toLowerCase();
+ String filePath = mfe.getPath().replace("/", "\\").toLowerCase();
+ for(DirEntity de : dirs){
+ if (filePath.contains(de.getFullName().toLowerCase() + "\\" + fileName)) {
+ code=de.getCode();
+ break;
+ }
+ }
+ mfe.setDircode(code);
+ }
+ }
+
+ /**
* 鑾峰彇鍙傛暟 *
* Enumeration<String> headers = req.getHeaderNames();
* Enumeration<String> attributes = req.getAttributeNames();
--
Gitblit v1.9.3