From c8e5656bd1d02f66b9e6e159da56804f7c7da112 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 09:28:50 +0800
Subject: [PATCH] 12
---
src/main/java/com/lf/server/service/data/UploadService.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 3efcf9d..92f9304 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -317,6 +317,9 @@
case StaticData.SHP:
copyMultiFile(mf, StaticData.SHP_EXT);
break;
+ case StaticData.OSGB:
+ copyFolderFile(mf);
+ break;
case StaticData.GDB:
if (gdbList.contains(mf.getPath())) {
String path = findPathByGuid(list, mf);
@@ -445,15 +448,11 @@
return;
}
- newFile.mkdirs();
- File[] files = file.listFiles();
- if (null == files || files.length == 0) {
- return;
- }
-
- for (File f : files) {
- String subFile = targetPath + File.separator + FileHelper.getFileName(f.getPath());
- f.renameTo(new File(subFile));
+ try {
+ // newFile.mkdirs()
+ FileUtils.moveDirectory(file, newFile);
+ } catch (Exception ex) {
+ log.error(ex);
}
mf.setPath(subPath);
}
@@ -484,12 +483,22 @@
*/
private void insertMetas(List<MetaFileEntity> list) {
int metaId = insertParentMeta(list);
+
+ List<String> guids = new ArrayList<>();
for (MetaFileEntity mf : list) {
if (null != mf.getMsg()) {
continue;
}
MetaEntity me = createMeta(mf, metaId);
+ if (StaticData.NGDB.equals(me.getType())) {
+ if (guids.contains(me.getGuid())) {
+ me.setMetaid(-1);
+ } else {
+ guids.add(me.getGuid());
+ }
+ }
+
metaService.insert(me);
String err = mf.getRows() < mf.getRecords() ? "(" + (mf.getRecords() - mf.getRows()) + " 鏉″け璐�)" : "";
mf.setMsg(me.getId() > 0 ? String.format("鎴愬姛%s", err) : "澶辫触");
--
Gitblit v1.9.3