From 036fccbe5fe150e86a51e474e32048ed92c72e48 Mon Sep 17 00:00:00 2001
From: sws <15810472099@163.com>
Date: 星期六, 26 十一月 2022 11:48:25 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/MdbHelper.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/MdbHelper.java b/src/main/java/com/lf/server/helper/MdbHelper.java
index 13a8e6c..4a7a158 100644
--- a/src/main/java/com/lf/server/helper/MdbHelper.java
+++ b/src/main/java/com/lf/server/helper/MdbHelper.java
@@ -3,6 +3,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.gdal.ogr.DataSource;
+import org.gdal.ogr.Driver;
 import org.gdal.ogr.Layer;
 import org.gdal.ogr.ogr;
 
@@ -21,20 +22,67 @@
      */
     public static List<String> getTabNames(String filePath) {
         List<String> list = new ArrayList<>();
+
+        Driver driver = null;
+        DataSource dataSource = null;
         try {
-            org.gdal.ogr.Driver driver = ogr.GetDriverByName("PGeo");
-            if (driver == null) {
+            driver = ogr.GetDriverByName("PGeo");
+            if (null == driver) {
                 return list;
             }
 
-            DataSource dataSource = driver.Open(filePath, 0);
+            dataSource = driver.Open(filePath, 0);
+            if (null == dataSource) {
+                return list;
+            }
+
             for (int i = 0, count = dataSource.GetLayerCount(); i < count; i++) {
                 Layer layer = dataSource.GetLayer(i);
-
                 list.add(layer.GetName());
+
+                layer.delete();
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+        } finally {
+            GdbHelper.delete(dataSource, driver);
+        }
+
+        return list;
+    }
+
+    /**
+     * 璇诲彇鏁版嵁
+     */
+    public static <T> List<T> readData(Class clazz, String filePath, String layerName) {
+        List<T> list = new ArrayList<>();
+
+        Driver driver = null;
+        DataSource dataSource = null;
+        try {
+            driver = ogr.GetDriverByName("PGeo");
+            if (null == driver) {
+                return list;
+            }
+
+            dataSource = driver.Open(filePath, 0);
+            if (null == dataSource) {
+                return list;
+            }
+
+            for (int i = 0, count = dataSource.GetLayerCount(); i < count; i++) {
+                Layer layer = dataSource.GetLayer(i);
+                if (layer.GetName().equals(layerName)) {
+                    GdbHelper.readLayer(clazz, layer, list);
+                    break;
+                }
+
+                layer.delete();
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        } finally {
+            GdbHelper.delete(dataSource, driver);
         }
 
         return list;

--
Gitblit v1.9.3