From 6997d659f4ad0b57b706d2764ae17d3cf0737fef Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 21 十一月 2022 19:08:33 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/DataLoaderService.java |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 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 ec3c55e..dc38d40 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -233,13 +233,9 @@
                         insertXls(root, mfe, tabs);
                         break;
                     case "shp":
-                        insertShp(temp + "_zip", mfe, tabs);
-                        break;
                     case "gdb":
-                        insertGdb(temp + "_zip", mfe, tabs);
-                        break;
                     case "mdb":
-                        insertMdb(temp + "_zip", mfe, tabs);
+                        insertDb(me.getType(), temp + "_zip", mfe, tabs);
                         break;
                     default:
                         break;
@@ -431,9 +427,9 @@
     }
 
     /**
-     * 鎻掑叆SHP
+     * 鎻掑叆DB
      */
-    private void insertShp(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
+    private void insertDb(String type, String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
         for (TabMapperEntity tab : tabs) {
             if (!tab.getFileName().equals(mfe.getName()) || StringHelper.isEmpty(tab.getEntity())) {
                 continue;
@@ -450,8 +446,21 @@
                 continue;
             }
 
-            List<?> list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
-            if (list.isEmpty()) {
+            List<?> list = null;
+            switch (type) {
+                case "shp":
+                    list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
+                    break;
+                case "gdb":
+                    list = GdbHelper.readData(clazz, root + File.separator + tab.getSubPath());
+                    break;
+                case "mdb":
+                    list = MdbHelper.readData(clazz, root + File.separator + tab.getSubPath());
+                    break;
+                default:
+                    break;
+            }
+            if (null == list || list.isEmpty()) {
                 continue;
             }
             setCreateInfo(list, mfe);
@@ -486,21 +495,5 @@
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }
-    }
-
-    /**
-     * 鎻掑叆GDB
-     */
-    private Integer insertGdb(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
-
-        return 0;
-    }
-
-    /**
-     * 鎻掑叆MDB
-     */
-    private Integer insertMdb(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
-
-        return 0;
     }
 }

--
Gitblit v1.9.3