From 05ffa1a7f490e1e81d6fbf1ee948db50b1fff6fc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 14 二月 2023 16:02:52 +0800
Subject: [PATCH] 修改depcode、dircode值
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 102 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 79 insertions(+), 23 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 22279eb..8e0fdb6 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -28,10 +28,10 @@
@Service
public class BaseUploadService {
@Autowired
- private DirService dirService;
+ protected DirService dirService;
@Autowired
- private PathHelper pathHelper;
+ protected PathHelper pathHelper;
public final Log log = LogFactory.getLog(getClass());
@@ -197,8 +197,8 @@
List<DirEntity> dirs = dirService.selectDirRecursive(dir.getName());
for (MetaFileEntity meta : metas) {
meta.setEventid(StringHelper.getGuid());
- meta.setDirid(dir.getId());
- meta.setDepid(ue.getDepid());
+ meta.setDircode(dir.getCode());
+ meta.setDepcode(ue.getDepcode());
meta.setVerid(ver.getId());
meta.setCreateUser(ue.getId());
meta.setEpsgCode(epsgCode);
@@ -213,6 +213,7 @@
list.add(meta);
}
+ setMetaType(list);
return list;
}
@@ -237,9 +238,43 @@
ZipHelper.unzip(zipFile, subPath);
List<File> files = new ArrayList<>();
- FileHelper.getFilesByPath(files, subPath);
+ getFilesByPath(files, subPath);
return getMapperFiles(files, dir, dirs, meta, tempPath.length() + 1);
+ }
+
+ /**
+ * 鏍规嵁璺緞鑾峰彇鏂囦欢
+ */
+ private void getFilesByPath(List<File> list, String path) {
+ File file = new File(path);
+ if (!file.isDirectory()) {
+ String extName = FileHelper.getExtension(file);
+ if (StaticData.ALL_EXTENSION.contains(extName)) {
+ list.add(file);
+ }
+ return;
+ }
+
+ if (isGdbFile(file)) {
+ list.add(file);
+ return;
+ }
+
+ File[] files = file.listFiles();
+ if (null == files) {
+ return;
+ }
+ for (File f : files) {
+ if (f.isDirectory()) {
+ getFilesByPath(list, f.getPath());
+ } else {
+ String extName = FileHelper.getExtension(f);
+ if (StaticData.ALL_EXTENSION.contains(extName)) {
+ list.add(f);
+ }
+ }
+ }
}
/**
@@ -255,14 +290,14 @@
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (!StaticData.ALL_EXTENSION.contains(extName)) {
+ if (!StaticData.ALL_EXTENSION.contains(extName) || fileName.startsWith("~")) {
continue;
}
- int dirid = getDirByPath(f.getPath(), dir, dirs);
+ String dircode = getDirByPath(f.getPath(), fileName, dir, dirs);
boolean isShp = StaticData.SHP.equals(extName);
if (isGdb) {
- List<MetaFileEntity> rs = getGdbMappers(f, meta, dirid, start);
+ List<MetaFileEntity> rs = getGdbMappers(f, meta, dircode, start);
if (null != rs && rs.size() > 0) {
list.addAll(rs);
}
@@ -270,7 +305,7 @@
}
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDirid(dirid);
+ mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(extName);
@@ -278,7 +313,7 @@
if (isShp) {
List<String> shpFiles = getShpFiles(f.getPath());
- mf.setTab(fileName);
+ mf.setTab(fileName.replace(StaticData.SHP, ""));
mf.setSizes(getFilesSize(shpFiles));
mf.setGuid(getFilesMd5(shpFiles));
} else {
@@ -296,8 +331,8 @@
*/
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
- mf.setDirid(meta.getDirid());
- mf.setDepid(meta.getDepid());
+ mf.setDircode(meta.getDircode());
+ mf.setDepcode(meta.getDepcode());
mf.setVerid(meta.getVerid());
mf.setCreateUser(meta.getCreateUser());
mf.setEpsgCode(meta.getEpsgCode());
@@ -308,32 +343,32 @@
/**
* 鏍规嵁鏂囦欢璺緞鑾峰彇鐩綍ID
*/
- private int getDirByPath(String filePath, DirEntity dir, List<DirEntity> dirs) {
+ private String getDirByPath(String filePath,String fileName, DirEntity dir, List<DirEntity> dirs) {
if (0 != dir.getPid() || null == dirs || dirs.isEmpty()) {
- return dir.getId();
+ return dir.getCode();
}
- if ("/".equals(File.separator)) {
+ if (StaticData.SLASH.equals(File.separator)) {
filePath = filePath.replace("/", "\\");
}
for (DirEntity entity : dirs) {
- if (filePath.contains(entity.getFullName())) {
- return entity.getId();
+ if (filePath.contains(entity.getFullName() + "\\" + fileName)) {
+ return entity.getCode();
}
}
- return dir.getId();
+ return dir.getCode();
}
/**
* 鑾峰彇SHP鏂囦欢闆嗗悎
*/
- private List<String> getShpFiles(String 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));
+ for (int i = 0, c = StaticData.SHP_EXT.size(); i < c; i++) {
+ String path = shpPath.replace(".shp", StaticData.SHP_EXT.get(i));
File f = new File(path);
if (f.exists() && !f.isDirectory()) {
@@ -399,7 +434,7 @@
/**
* 鑾峰彇GDB鏂囦欢鏄犲皠
*/
- private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, int dirid, int start) {
+ private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, String dircode, int start) {
List<String> tabs = GdbHelper.getTabNames(f.getPath());
if (null == tabs || tabs.size() == 0) {
return null;
@@ -415,7 +450,7 @@
List<MetaFileEntity> list = new ArrayList<>();
for (String tab : tabs) {
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDirid(dirid);
+ mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(extName);
@@ -451,6 +486,27 @@
}
/**
+ * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
+ */
+ private void setMetaType(List<MetaFileEntity> list) {
+ for (MetaFileEntity mf : list) {
+ if (null != mf.getExtName()) {
+ mf.setType(mf.getExtName().replace(".", ""));
+ }
+ }
+ }
+
+ /**
+ * 澶勭悊鐩綍
+ */
+ public void copePath(List<MetaFileEntity> list) {
+ String basePath = pathHelper.getConfig().getTempPath() + File.separator;
+ for (MetaFileEntity mf : list) {
+ mf.setPath(mf.getPath().replace(basePath, ""));
+ }
+ }
+
+ /**
* 鑾峰彇鍙傛暟 *
* Enumeration<String> headers = req.getHeaderNames();
* Enumeration<String> attributes = req.getAttributeNames();
--
Gitblit v1.9.3