From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 141 ++++++++++++++++++++++++++++++++++------------
1 files changed, 103 insertions(+), 38 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 0a5af79..7f68fdc 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());
@@ -45,7 +45,7 @@
/**
* 涓婁紶鏂囦欢
*/
- public <T> List<MetaFileEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public <T> List<MetaFileEntity> uploadData(T t, String path, boolean isGetGuid, HttpServletRequest req, HttpServletResponse res) throws Exception {
StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest) req;
req.setCharacterEncoding("utf-8");
res.setContentType("application/json;charset=utf-8");
@@ -54,7 +54,7 @@
setEntity(t, request);
}
- return getFiles(path, request);
+ return getFiles(path, isGetGuid, request);
}
/**
@@ -97,7 +97,7 @@
/**
* 鑾峰彇鏂囦欢
*/
- public List<MetaFileEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
+ public List<MetaFileEntity> getFiles(String subPath, boolean isGetGuid, StandardMultipartHttpServletRequest req) throws Exception {
List<MetaFileEntity> list = new ArrayList<>();
String path = pathHelper.getTempPath(subPath);
@@ -116,7 +116,9 @@
mf.setPath(path + File.separator + mf.getName());
file.transferTo(new File(mf.getPath()));
- mf.setGuid(FileHelper.getFileMd5(mf.getPath()));
+ if (isGetGuid) {
+ mf.setGuid(FileHelper.getFileMd5(mf.getPath()));
+ }
list.add(mf);
}
@@ -127,7 +129,7 @@
/**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) {
+ public List<MetaFileEntity> selectFiles(String subPath) {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -143,7 +145,7 @@
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (null != extList && !extList.contains(extName)) {
+ if (!isExtValid(extName)) {
continue;
}
@@ -188,17 +190,17 @@
* 鏌ヨ鏄犲皠
*/
public List<MetaFileEntity> selectMappers(UserEntity ue, String path, DirEntity dir, VerEntity ver, String epsgCode) {
- List<MetaFileEntity> metas = selectFiles(path, StaticData.ALL_EXTENSION);
+ List<MetaFileEntity> metas = selectFiles(path);
if (null == metas || metas.isEmpty()) {
return null;
}
List<MetaFileEntity> list = new ArrayList<>();
- List<DirEntity> dirs = dirService.selectDirRecursive(dir.getName());
+ List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
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 +215,7 @@
list.add(meta);
}
+ setMetaType(list);
return list;
}
@@ -233,22 +236,61 @@
zipFolder.mkdirs();
}
- String subPath = zipFolder + File.separator + meta.getName().toLowerCase().replace(".zip", "");
+ // String subPath = zipFolder + File.separator + meta.getName().toLowerCase().replace(".zip", "") .replace("锛�","").replace("锛�","").replace(" ","")
+ String subPath = zipFolder.getPath();
ZipHelper.unzip(zipFile, subPath);
- File subFile = new File(subPath);
- File[] files = subFile.listFiles();
- if (null == files || files.length == 0) {
- return null;
- }
+ List<File> files = new ArrayList<>();
+ 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 (isExtValid(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 (isExtValid(extName)) {
+ list.add(f);
+ }
+ }
+ }
+ }
+
+ /**
+ * 鎵╁睍鏄惁鏈夋晥
+ */
+ private boolean isExtValid(String extName) {
+ return StaticData.ALL_EXTENSION.contains(extName) && !StaticData.MAPPER_EXCLUDE_EXT.contains(extName);
+ }
+
+ /**
* 鑾峰彇鏄犲皠鏂囦欢
*/
- private List<MetaFileEntity> getMapperFiles(File[] files, DirEntity dir, List<DirEntity> dirs, MetaFileEntity meta, int start) {
+ private List<MetaFileEntity> getMapperFiles(List<File> files, DirEntity dir, List<DirEntity> dirs, MetaFileEntity meta, int start) {
List<MetaFileEntity> list = new ArrayList<>();
for (File f : files) {
boolean isGdb = isGdbFile(f);
@@ -258,14 +300,14 @@
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (!StaticData.ALL_EXTENSION.contains(extName)) {
+ if (!isExtValid(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);
}
@@ -273,7 +315,7 @@
}
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDirid(dirid);
+ mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(extName);
@@ -281,7 +323,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 {
@@ -299,8 +341,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());
@@ -311,32 +353,34 @@
/**
* 鏍规嵁鏂囦欢璺緞鑾峰彇鐩綍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("/", "\\");
}
+ fileName = fileName.toLowerCase();
+ filePath = filePath.toLowerCase();
for (DirEntity entity : dirs) {
- if (filePath.contains(entity.getFullName())) {
- return entity.getId();
+ if (filePath.contains(entity.getFullName().toLowerCase() + "\\" + 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()) {
@@ -402,7 +446,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;
@@ -418,7 +462,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);
@@ -454,12 +498,33 @@
}
/**
+ * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
+ */
+ 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();
*/
public Map<String, String> getParams(StandardMultipartHttpServletRequest req) {
- Map<String, String> map = new HashMap<String, String>(3);
+ Map<String, String> map = new HashMap<>(3);
Enumeration<String> enumeration = req.getParameterNames();
while (enumeration.hasMoreElements()) {
--
Gitblit v1.9.3