From a532bbe01ac6e198c61db967eb4aa85ab92f71df Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 26 十一月 2022 19:42:04 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdbHelper.java |   98 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index 48d1d14..115776a 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -9,10 +9,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * GDB甯姪绫�
@@ -21,11 +18,48 @@
 public class GdbHelper {
     private final static Log log = LogFactory.getLog(GdbHelper.class);
 
-    public static List<String> excludeFields = new ArrayList<String>();
+    public static List<String> excludeFields = new ArrayList<>(Arrays.asList("gid", "shape_leng"));
 
-    static {
-        excludeFields.add("gid");
-        excludeFields.add("shape_leng");
+    /**
+     * 閿�姣佽祫婧�
+     */
+    public static void delete(Layer layer) {
+        try {
+            if (null != layer) {
+                layer.delete();
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+    }
+
+    /**
+     * 閿�姣佽祫婧�
+     */
+    public static void delete(DataSource dataSource, Driver driver) {
+        try {
+            if (null != dataSource) {
+                dataSource.delete();
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+
+        try {
+            if (null != driver) {
+                driver.delete();
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+    }
+
+    /**
+     * 閿�姣佽祫婧�
+     */
+    public static void delete(Layer layer, DataSource dataSource, Driver driver) {
+        delete(layer);
+        delete(dataSource, driver);
     }
 
     /**
@@ -33,13 +67,16 @@
      */
     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("OpenFileGDB");
+            driver = ogr.GetDriverByName("OpenFileGDB");
             if (null == driver) {
                 return list;
             }
 
-            DataSource dataSource = driver.Open(filePath, 0);
+            dataSource = driver.Open(filePath, 0);
             if (null == dataSource) {
                 return list;
             }
@@ -50,11 +87,10 @@
 
                 layer.delete();
             }
-
-            dataSource.delete();
-            driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+        } finally {
+            GdbHelper.delete(dataSource, driver);
         }
 
         return list;
@@ -65,20 +101,22 @@
      */
     public static <T> List<T> readData(Class clazz, String filePath, String layerName) {
         List<T> list = new ArrayList<>();
+
+        Driver driver = null;
+        DataSource dataSource = null;
         try {
-            org.gdal.ogr.Driver driver = ogr.GetDriverByName("OpenFileGDB");
+            driver = ogr.GetDriverByName("OpenFileGDB");
             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);
-
                 if (layer.GetName().equals(layerName)) {
                     GdbHelper.readLayer(clazz, layer, list);
                     break;
@@ -86,11 +124,10 @@
 
                 layer.delete();
             }
-
-            dataSource.delete();
-            driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+        } finally {
+            GdbHelper.delete(dataSource, driver);
         }
 
         return list;
@@ -124,9 +161,7 @@
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         } finally {
-            if (null != layer) {
-                layer.delete();
-            }
+            GdbHelper.delete(layer);
         }
     }
 
@@ -135,7 +170,7 @@
      */
     private static Field getGeomField(Class clazz) {
         try {
-            Field gField = clazz.getDeclaredField("geom");
+            Field gField = clazz.getSuperclass().getDeclaredField("geom");
             gField.setAccessible(true);
 
             return gField;
@@ -237,10 +272,10 @@
      * wkbLinearRing = 101
      */
     private static <T> void setGeom(T t, Feature f, Field gField) throws Exception {
-        Geometry geometry = f.GetGeometryRef();
-        if (null != geometry) {
-            String wkt = geometry.ExportToWkt();
-            switch (geometry.GetGeometryType()) {
+        String geo = "null";
+        if (null != f.GetGeometryRef()) {
+            String wkt = f.GetGeometryRef().ExportToWkt();
+            switch (f.GetGeometryRef().GetGeometryType()) {
                 case 2:
                     wkt = wkt.replace("LINESTRING (", "MULTILINESTRING ((") + ")";
                     break;
@@ -250,9 +285,10 @@
                 default:
                     break;
             }
-
-            gField.set(t, String.format("ST_GeomFromText('%s')", wkt));
+            geo = String.format("ST_GeomFromText('%s')", wkt);
         }
+
+        gField.set(t, geo);
     }
 
     /**
@@ -278,8 +314,6 @@
                 LocalTime.of(pnHour[0], pnMinute[0], s, ns)
         );
 
-        Timestamp timestamp = Timestamp.valueOf(localDateTime);
-
-        return timestamp;
+        return Timestamp.valueOf(localDateTime);
     }
 }

--
Gitblit v1.9.3