From d885c204473cd22c1a745c97f6a5a425506d1276 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 03 十二月 2022 08:29:20 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdbHelper.java |  112 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index 11a27f9..33c0e36 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -18,20 +18,67 @@
 public class GdbHelper {
     private final static Log log = LogFactory.getLog(GdbHelper.class);
 
-    public static List<String> excludeFields = new ArrayList<>(Arrays.asList("gid", "shape_leng"));
+    private final static String OBJECT ="java.lang.Object";
+
+    private static List<String> excludeFields = new ArrayList<>(Arrays.asList("gid", "objectid", "dirid", "depid", "verid","createtime", "createuser", "updateuser", "updatetime", "shape_leng", "shape_area"));
+
+    /**
+     * 閿�姣佽祫婧�
+     */
+    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);
+    }
 
     /**
      * 鑾峰彇琛ㄥ悕
      */
     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;
             }
@@ -42,11 +89,10 @@
 
                 layer.delete();
             }
-
-            dataSource.delete();
-            driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+        } finally {
+            GdbHelper.delete(dataSource, driver);
         }
 
         return list;
@@ -57,20 +103,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;
@@ -78,11 +126,10 @@
 
                 layer.delete();
             }
-
-            dataSource.delete();
-            driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+        } finally {
+            GdbHelper.delete(dataSource, driver);
         }
 
         return list;
@@ -94,11 +141,10 @@
     public static <T> void readLayer(Class clazz, Layer layer, List<T> list) {
         try {
             Field gField = getGeomField(clazz);
-            Map<Integer, Field> map = getFieldMapper(clazz, layer);
-            if (map.size() == 0) {
-                return;
-            }
-            if (1 > layer.GetFeatureCount()) {
+
+            Map<Integer, Field> map = new HashMap<>(3);
+            getFieldMapper(clazz, layer, map);
+            if (map.isEmpty() || 0 == layer.GetFeatureCount()) {
                 return;
             }
 
@@ -116,9 +162,7 @@
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         } finally {
-            if (null != layer) {
-                layer.delete();
-            }
+            GdbHelper.delete(layer);
         }
     }
 
@@ -139,16 +183,14 @@
     /**
      * 鑾峰彇瀛楁鏄犲皠
      */
-    private static <T> Map<Integer, Field> getFieldMapper(Class clazz, Layer layer) {
-        Map<Integer, Field> map = new HashMap<>(3);
-
+    private static <T> void getFieldMapper(Class clazz, Layer layer, Map<Integer, Field> map) {
         try {
             FeatureDefn fd = layer.GetLayerDefn();
             for (int i = 0, count = fd.GetFieldCount(); i < count; i++) {
                 FieldDefn fieldDefn = fd.GetFieldDefn(i);
                 try {
                     String name = fieldDefn.GetName().toLowerCase();
-                    if (excludeFields.contains(name)){
+                    if (excludeFields.contains(name)) {
                         continue;
                     }
 
@@ -160,11 +202,13 @@
                     //
                 }
             }
+
+            if (OBJECT != clazz.getSuperclass().getName()) {
+                getFieldMapper(clazz.getSuperclass(), layer, map);
+            }
         } catch (Exception ex) {
             //
         }
-
-        return map;
     }
 
     /**
@@ -191,21 +235,21 @@
      * 璁剧疆鍊�
      */
     private static <T> void setValue(T t, Feature f, Field field, Integer i) throws Exception {
-        switch (field.getType().toString()) {
-            case "class java.math.BigDecimal":
-            case "class java.lang.Double":
+        switch (field.getType().getName()) {
+            case "java.math.BigDecimal":
+            case "java.lang.Double":
             case "double":
                 field.set(t, f.GetFieldAsDouble(i));
                 break;
-            case "class java.lang.Long":
+            case "java.lang.Long":
             case "long":
                 field.set(t, f.GetFieldAsInteger64(i));
                 break;
-            case "class java.lang.Integer":
+            case "java.lang.Integer":
             case "int":
                 field.set(t, f.GetFieldAsInteger(i));
                 break;
-            case "class java.sql.Timestamp":
+            case "java.sql.Timestamp":
                 field.set(t, getTimestamp(f, i));
                 break;
             default:
@@ -271,8 +315,6 @@
                 LocalTime.of(pnHour[0], pnMinute[0], s, ns)
         );
 
-        Timestamp timestamp = Timestamp.valueOf(localDateTime);
-
-        return timestamp;
+        return Timestamp.valueOf(localDateTime);
     }
 }

--
Gitblit v1.9.3