From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 423 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 335 insertions(+), 88 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 62fb8d6..eb21b50 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -6,6 +6,8 @@
import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
+import com.lf.server.service.data.DirService;
+import com.lf.server.service.sys.TokenService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
@@ -26,8 +29,14 @@
*/
@Service
public class BaseUploadService {
- @Autowired
- public PathHelper pathHelper;
+ @Resource
+ protected DirService dirService;
+
+ @Resource
+ protected PathHelper pathHelper;
+
+ @Resource
+ protected TokenService tokenService;
public final Log log = LogFactory.getLog(getClass());
@@ -41,7 +50,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");
@@ -50,7 +59,7 @@
setEntity(t, request);
}
- return getFiles(path, request);
+ return getFiles(path, isGetGuid, request);
}
/**
@@ -93,7 +102,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);
@@ -112,7 +121,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);
}
@@ -123,7 +134,7 @@
/**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) {
+ public List<MetaFileEntity> selectFiles(String subPath, boolean hasMd5) {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -139,7 +150,7 @@
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (null != extList && !extList.contains(extName)) {
+ if (!isFileValid(f.getName())) {
continue;
}
@@ -148,7 +159,7 @@
mf.setExtName(extName);
mf.setSizes(FileHelper.sizeToMb(f.length()));
mf.setPath(subPath + File.separator + fileName);
- if (!StaticData.ZIP.equals(extName)) {
+ if (hasMd5 && !StaticData.ZIP.equals(extName)) {
mf.setGuid(FileHelper.getFileMd5(f.getPath()));
}
@@ -184,7 +195,7 @@
* 鏌ヨ鏄犲皠
*/
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, true);
if (null == metas || metas.isEmpty()) {
return null;
}
@@ -192,8 +203,7 @@
List<MetaFileEntity> list = new ArrayList<>();
for (MetaFileEntity meta : metas) {
meta.setEventid(StringHelper.getGuid());
- meta.setDirid(dir.getId());
- meta.setDepid(ue.getDepid());
+ meta.setDepcode(ue.getDepcode());
meta.setVerid(ver.getId());
meta.setCreateUser(ue.getId());
meta.setEpsgCode(epsgCode);
@@ -205,10 +215,10 @@
continue;
}
}
-
- meta.setEventid(StringHelper.getGuid());
list.add(meta);
}
+ setMetaType(list);
+ setDircode(list, dir);
return list;
}
@@ -217,7 +227,8 @@
* 鑾峰彇鏄犲皠鏂囦欢
*/
private List<MetaFileEntity> getMapperFiles(String path, MetaFileEntity meta) {
- String zipFile = pathHelper.getConfig().getTempPath() + File.separator + meta.getPath();
+ String tempPath = pathHelper.getConfig().getTempPath();
+ String zipFile = tempPath + File.separator + meta.getPath();
File file = new File(zipFile);
if (!file.exists() || file.isDirectory()) {
return null;
@@ -228,52 +239,100 @@
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, meta, tempPath.length() + 1);
+ }
+
+ /**
+ * 鏍规嵁璺緞鑾峰彇鏂囦欢
+ */
+ private void getFilesByPath(List<File> list, String path) {
+ File file = new File(path);
+ if (!file.isDirectory()) {
+ if (isFileValid(file.getName())) {
+ list.add(file);
+ }
+ return;
}
- return getMapperFiles(files, meta, subPath);
+ if (isGdbFile(file) || isOsgbFile(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 {
+ if (isFileValid(f.getName())) {
+ list.add(f);
+ }
+ }
+ }
+ }
+
+ /**
+ * 鏂囦欢鏄�/鍚︽湁鏁�
+ */
+ private boolean isFileValid(String fileName) {
+ String extName = FileHelper.getExtension(fileName);
+ if (fileName.startsWith(StaticData.TILDE) || !StaticData.ALL_EXTENSION.contains(extName)) {
+ return false;
+ }
+
+ fileName = fileName.toLowerCase();
+ for (String ext : StaticData.MAPPER_EXCLUDE_EXT) {
+ if (fileName.contains(ext)) {
+ return false;
+ }
+ }
+
+ return true;
}
/**
* 鑾峰彇鏄犲皠鏂囦欢
*/
- private List<MetaFileEntity> getMapperFiles(File[] files, MetaFileEntity meta,String subPath) {
+ private List<MetaFileEntity> getMapperFiles(List<File> files, MetaFileEntity meta, int start) {
List<MetaFileEntity> list = new ArrayList<>();
for (File f : files) {
boolean isGdb = isGdbFile(f);
- if (!isGdb && f.isDirectory()) {
+ boolean isOsgb = isOsgbFile(f);
+ boolean isFile = isGdb || isOsgb;
+ if (f.isDirectory() && !isFile) {
continue;
}
String fileName = FileHelper.getFileName(f.getPath());
- String extName = FileHelper.getExtension(fileName);
- if (!StaticData.ALL_EXTENSION.contains(extName)) {
+ String extName = isOsgb ? StaticData.OSGB : FileHelper.getExtension(fileName);
+ if (!isFileValid(f.getName())) {
continue;
}
- boolean isShp = StaticData.SHP.equals(extName);
if (isGdb) {
- String md5 = getGdbMd5(f.getPath());
+ List<MetaFileEntity> rs = getGdbMappers(f, meta, start);
+ if (null != rs && rs.size() > 0) {
+ list.addAll(rs);
+ }
+ continue;
+ }
+ if (isOsgb) {
+ list.add(getOsgbMapper(f, meta, start));
continue;
}
- MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setName(fileName);
- mf.setExtName(extName);
- mf.setSizes(FileHelper.sizeToMb(f.length()));
- mf.setPath(f.getPath().substring(subPath.length()));
- if (isShp) {
- mf.setTab(fileName);
- mf.setGuid(getShpMd5(f.getPath()));
- } else {
- mf.setGuid(FileHelper.getFileMd5(f.getPath()));
- }
+ MetaFileEntity mf = createMetaFileEntity(f, meta, fileName, extName);
+ mf.setPath(f.getPath().substring(start));
list.add(mf);
}
@@ -283,11 +342,33 @@
/**
* 鍒涘缓鍏冩暟鎹枃浠跺疄浣撶被
*/
+ private MetaFileEntity createMetaFileEntity(File f, MetaFileEntity meta, String fileName, String extName) {
+ boolean isShp = StaticData.SHP.equals(extName);
+
+ MetaFileEntity mf = createMetaFileEntity(meta);
+ mf.setEventid(StringHelper.getGuid());
+ mf.setName(fileName);
+ mf.setExtName(extName);
+
+ if (isShp) {
+ List<String> shpFiles = getShpFiles(f.getPath());
+ mf.setTab(fileName.replace(StaticData.SHP, ""));
+ mf.setSizes(getFilesSize(shpFiles));
+ mf.setGuid(getFilesMd5(shpFiles));
+ } else {
+ mf.setSizes(FileHelper.sizeToMb(f.length()));
+ mf.setGuid(FileHelper.getFileMd5(f.getPath()));
+ }
+
+ return mf;
+ }
+
+ /**
+ * 鍒涘缓鍏冩暟鎹枃浠跺疄浣撶被
+ */
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
- mf.setEventid(StringHelper.getGuid());
- mf.setDirid(meta.getDirid());
- mf.setDepid(meta.getDepid());
+ mf.setDepcode(meta.getDepcode());
mf.setVerid(meta.getVerid());
mf.setCreateUser(meta.getCreateUser());
mf.setEpsgCode(meta.getEpsgCode());
@@ -296,80 +377,107 @@
}
/**
- * 鑾峰彇SHP鏂囦欢鐨凪D5鐮�
+ * 鑾峰彇SHP鏂囦欢闆嗗悎
*/
- private String getShpMd5(String shpPath) {
- List<String> files = new ArrayList<>();
- files.add(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()) {
- files.add(path);
+ list.add(path);
}
}
- return getFilesMd5(files);
+ return list;
}
/**
- * 鑾峰彇GDB鏂囦欢鐨凪D5鐮�
+ * 鑾峰彇GDB鏂囦欢闆嗗悎
*/
- private String getGdbMd5(String path) {
+ private List<String> getGdbFiles(String path) {
+ List<String> list = new ArrayList<>();
+
File[] files = new File(path).listFiles();
if (null == files || files.length == 0) {
- return StringHelper.getGuid();
+ return list;
}
-
- List<String> list = new ArrayList<>();
for (File f : files) {
list.add(f.getPath());
}
- return getFilesMd5(list);
+ return list;
}
/**
* 鑾峰彇澶氭枃浠剁殑MD5
*/
- private String getFilesMd5(List<String> list) {
- StringBuilder sb = new StringBuilder();
- for (String str : list) {
- String md5 = FileHelper.getFileMd5(str);
+ private String getFilesMd5(List<String> files) {
+ List<String> list = new ArrayList<>();
+ for (String file : files) {
+ String md5 = FileHelper.getFileMd5(file);
if (null != md5) {
- sb.append(sb + ",");
+ list.add(md5);
}
}
- if (sb.length() > 0) {
- return FileHelper.getStringMd5(sb.toString());
+ if (list.size() > 0) {
+ String str = StringHelper.join(list, ",");
+ return FileHelper.getStringMd5(str);
}
return StringHelper.getGuid();
}
- private void getGdbFiles(String shpPath, List<String> list) {
- File file = new File(shpPath);
-
- File[] files = file.listFiles();
- if (null == files || files.length == 0) {
- return;
+ /**
+ * 鑾峰彇澶氭枃浠剁殑澶у皬
+ */
+ private double getFilesSize(List<String> files) {
+ long size = 0L;
+ for (String file : files) {
+ File f = new File(file);
+ if (f.exists() && !f.isDirectory()) {
+ size += f.length();
+ }
}
- for (File f : files) {
- if (!f.isDirectory()) {
- continue;
- }
+ return FileHelper.sizeToMb(size);
+ }
- if (isGdbFile(f)) {
- list.add(f.getPath());
- continue;
- }
-
- getGdbFiles(f.getPath(), list);
+ /**
+ * 鑾峰彇GDB鏂囦欢鏄犲皠
+ */
+ 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;
}
+
+ String fileName = FileHelper.getFileName(f.getPath());
+ String extName = FileHelper.getExtension(fileName);
+
+ List<String> gdbFiles = getGdbFiles(f.getPath());
+ String md5 = getFilesMd5(gdbFiles);
+ double sizes = getFilesSize(gdbFiles);
+
+ List<MetaFileEntity> list = new ArrayList<>();
+ for (String tab : tabs) {
+ MetaFileEntity mf = createMetaFileEntity(meta);
+ mf.setEventid(StringHelper.getGuid());
+ mf.setName(fileName + "\\" + tab);
+ mf.setExtName(extName);
+ mf.setSizes(FileHelper.sizeToMb(f.length()));
+ mf.setPath(f.getPath().substring(start));
+ mf.setTab(tab);
+ mf.setSizes(sizes);
+ mf.setGuid(md5);
+ list.add(mf);
+ }
+
+ return list;
}
/**
@@ -377,19 +485,158 @@
*/
private boolean isGdbFile(File f) {
if (f.isDirectory() && f.getName().toLowerCase().endsWith(StaticData.GDB)) {
- File[] files = f.listFiles();
- if (null == files || files.length == 0) {
- return false;
- }
+ File gdb = new File(f.getPath() + File.separator + "gdb");
- for (File file : files) {
- if ("gdb".equals(file.getName())) {
- return true;
- }
- }
+ return gdb.exists() && !gdb.isDirectory();
}
return false;
+ }
+
+ /**
+ * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
+ */
+ 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, ""));
+ }
+ }
+
+ /**
+ * 鏄�/鍚︿负OSGB鏂囦欢
+ */
+ private boolean isOsgbFile(File f) {
+ if (f.isDirectory()) {
+ File meta = new File(f.getPath() + File.separator + "metadata.xml");
+ File data = new File(f.getPath() + File.separator + "Data");
+
+ return meta.exists() && !meta.isDirectory() && data.exists() && data.isDirectory();
+ }
+
+ return false;
+ }
+
+ /**
+ * 鑾峰彇OSGB鏂囦欢鏄犲皠
+ */
+ private MetaFileEntity getOsgbMapper(File f, MetaFileEntity meta, int start) {
+ String fileName = FileHelper.getFileName(f.getPath());
+
+ List<String> files = new ArrayList<>();
+ FileHelper.getFilesByPath(files, f.getPath());
+
+ String md5 = getFilesMd5(files);
+ double sizes = getFilesSize(files);
+
+ MetaFileEntity mf = createMetaFileEntity(meta);
+ mf.setEventid(StringHelper.getGuid());
+ mf.setName(fileName);
+ mf.setExtName(StaticData.OSGB);
+ mf.setSizes(FileHelper.sizeToMb(f.length()));
+ mf.setPath(f.getPath().substring(start));
+ mf.setSizes(sizes);
+ mf.setGuid(md5);
+
+ return mf;
+ }
+
+ /**
+ * 璁剧疆鐩綍缂栫爜
+ */
+ private void setDircode(List<MetaFileEntity> list, DirEntity dir) {
+ List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
+ for (MetaFileEntity mfe : list) {
+ String filePath = mfe.getPath().toLowerCase().replace("/", "\\");
+ String fileName = mfe.getName().toLowerCase();
+
+ String code = findDirByPath(dirs, filePath, fileName);
+ if (StringHelper.isEmpty(code)) {
+ DirEntity baseDir = findBaseDirByPath(dirs, filePath);
+ if (null != baseDir) {
+ createDirByPath(baseDir, mfe.getPath().replace("/", "\\"));
+ dirs = dirService.selectRecursiveById(dir.getId());
+ code = findDirByPath(dirs, filePath, fileName);
+ }
+ }
+ code = StringHelper.isEmpty(code) ? dir.getCode() : code;
+ mfe.setDircode(code);
+ }
+ }
+
+ /**
+ * 鏍规嵁璺緞鏌ユ壘鐩綍
+ */
+ private String findDirByPath(List<DirEntity> dirs, String filePath,String fileName) {
+ for (DirEntity de : dirs) {
+ if (filePath.contains(de.getFullName().toLowerCase() + "\\" + fileName)) {
+ return de.getCode();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * 鏍规嵁璺緞鏌ユ壘鐖剁洰褰�
+ */
+ private DirEntity findBaseDirByPath(List<DirEntity> dirs, String filePath) {
+ for (DirEntity de : dirs) {
+ if (StringHelper.isEmpty(de.getCode()) || de.getCode().length() != StaticData.FOUR) {
+ continue;
+ }
+ if (filePath.contains(de.getFullName().toLowerCase() + "\\")) {
+ return de;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * 鏍规嵁璺緞鍒涘缓鐩綍
+ */
+ private void createDirByPath(DirEntity baseDir, String filePath) {
+ int start = filePath.toLowerCase().indexOf(baseDir.getFullName().toLowerCase() + "\\") + baseDir.getFullName().length() + 1;
+ int end = filePath.lastIndexOf("\\");
+ if (end <= start) {
+ return;
+ }
+ if (0 == baseDir.getLevel()) {
+ baseDir.setLevel(2);
+ }
+
+ HttpServletRequest req = WebHelper.getRequest();
+ UserEntity ue = tokenService.getCurrentUser(req);
+
+ String[] strs = filePath.substring(start, end).split("\\\\");
+ for (String str : strs) {
+ DirEntity entity = dirService.selectDirByName(str, baseDir.getId());
+ if (null == entity) {
+ entity = new DirEntity();
+ entity.setPid(baseDir.getId());
+ entity.setName(str);
+ entity.setOrderNum(dirService.selectMaxOrderNum());
+ entity.setLevel(baseDir.getLevel() + 1);
+ entity.setCreateUser(ue.getId());
+
+ dirService.insert(entity);
+ baseDir = dirService.selectDir(entity.getId());
+ } else {
+ baseDir = entity;
+ }
+ }
}
/**
@@ -398,7 +645,7 @@
* 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