From bab794149027f53bfcfa1499dd01ba3e41e983be Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 十一月 2022 16:24:22 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/DataLoaderService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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 efdbee8..3461435 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -70,17 +70,21 @@
      * 鑾峰彇鏄犲皠
      */
     private List<TabMapperEntity> getMappers(String zipPath, File[] files) {
+        String temp = pathHelper.getConfig().getTempPath();
+
         List<TabMapperEntity> list = new ArrayList<>();
         for (File f : files) {
             String fileName = FileHelper.getFileName(f.getPath());
             if (fileName.contains(XLS)) {
-                list.add(new TabMapperEntity(fileName, "xls", null, fileName));
+                String path = f.getPath().replace(temp + File.separator, "");
+                list.add(new TabMapperEntity(fileName, "xls", null, path));
                 continue;
             }
             if (fileName.contains(MDB)) {
+                String path = f.getPath().replace(temp + File.separator, "");
                 List<String> tabs = MdbHelper.getTabNames(f.getPath());
                 for (String tab : tabs) {
-                    list.add(new TabMapperEntity(fileName, "mdb", tab, fileName));
+                    list.add(new TabMapperEntity(fileName, "mdb", tab, path));
                 }
                 continue;
             }
@@ -236,8 +240,7 @@
                     case "shp":
                     case "gdb":
                     case "mdb":
-                        String zipPath = FileHelper.getPath(temp + File.separator + mf.getPath()) + "_zip";
-                        insertDb(me.getType(), zipPath, mfe, tabs);
+                        insertDb(me.getType(), temp, mfe, tabs);
                         break;
                     default:
                         break;

--
Gitblit v1.9.3