From 7d49019d2cca2c58fe0412e40afb64755d33cfa6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 十一月 2022 15:33:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 3f18951..efdbee8 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -9,6 +9,7 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.all.BaseUploadService;
+import org.apache.commons.text.StringEscapeUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -73,7 +74,7 @@
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
if (fileName.contains(XLS)) {
- list.add(new TabMapperEntity(fileName, "xls", fileName));
+ list.add(new TabMapperEntity(fileName, "xls", null, fileName));
continue;
}
if (fileName.contains(MDB)) {
@@ -110,7 +111,7 @@
List<String> files = new ArrayList<>();
getShpFiles(subPath, files);
- String root = subPath.substring(0, subPath.lastIndexOf(File.separator) + 1);
+ String root = pathHelper.getConfig().getTempPath() + File.separator;
for (String file : files) {
String name = FileHelper.getFileName(file);
String path = file.replace(root, "");
@@ -148,7 +149,7 @@
List<String> files = new ArrayList<>();
getGdbFiles(subPath, files);
- String root = subPath.substring(0, subPath.lastIndexOf(File.separator) + 1);
+ String root = pathHelper.getConfig().getTempPath() + File.separator;
for (String file : files) {
String path = file.replace(root, "");
List<String> tabs = GdbHelper.getTabNames(file);
@@ -235,7 +236,8 @@
case "shp":
case "gdb":
case "mdb":
- insertDb(me.getType(), temp + "_zip", mfe, tabs);
+ String zipPath = FileHelper.getPath(temp + File.separator + mf.getPath()) + "_zip";
+ insertDb(me.getType(), zipPath, mfe, tabs);
break;
default:
break;
@@ -446,16 +448,17 @@
continue;
}
+ String filePath = StringEscapeUtils.escapeJava(root + File.separator + tab.getSubPath());
List<?> list = null;
switch (type) {
case "shp":
- list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
+ list = ShpHelper.readData(clazz, filePath);
break;
case "gdb":
- list = GdbHelper.readData(clazz, root + File.separator + tab.getSubPath(), tab.getTab());
+ list = GdbHelper.readData(clazz, filePath, tab.getTab());
break;
case "mdb":
- list = MdbHelper.readData(clazz, root + File.separator + tab.getSubPath(), tab.getTab());
+ list = MdbHelper.readData(clazz, filePath, tab.getTab());
break;
default:
break;
@@ -466,9 +469,6 @@
setCreateInfo(list, mfe);
Integer rows = basicMapper.insertBatch(list);
- if (basicMapper instanceof GeomBaseMapper) {
- updateDbGeom((GeomBaseMapper) basicMapper, list);
- }
tab.setRows(rows);
}
--
Gitblit v1.9.3