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

---
 src/main/java/com/lf/server/helper/MdbHelper.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/MdbHelper.java b/src/main/java/com/lf/server/helper/MdbHelper.java
index 1b515bf..66c99f5 100644
--- a/src/main/java/com/lf/server/helper/MdbHelper.java
+++ b/src/main/java/com/lf/server/helper/MdbHelper.java
@@ -30,9 +30,12 @@
             DataSource dataSource = driver.Open(filePath, 0);
             for (int i = 0, count = dataSource.GetLayerCount(); i < count; i++) {
                 Layer layer = dataSource.GetLayer(i);
-
                 list.add(layer.GetName());
+
+                layer.delete();
             }
+
+            driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }
@@ -43,10 +46,27 @@
     /**
      * 璇诲彇鏁版嵁
      */
-    public static <T> List<T> readData(Class clazz, String filePath) {
+    public static <T> List<T> readData(Class clazz, String filePath, String layerName) {
         List<T> list = new ArrayList<>();
         try {
+            org.gdal.ogr.Driver driver = ogr.GetDriverByName("PGeo");
+            if (driver == null) {
+                return list;
+            }
 
+            DataSource dataSource = driver.Open(filePath, 0);
+            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();
+            }
+
+            driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }

--
Gitblit v1.9.3