From 2d2d9138fbe5c9c43f070be59a2d10f18fbf4c3b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 09:05:06 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index fdda98f..48d1d14 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -21,6 +21,13 @@
 public class GdbHelper {
     private final static Log log = LogFactory.getLog(GdbHelper.class);
 
+    public static List<String> excludeFields = new ArrayList<String>();
+
+    static {
+        excludeFields.add("gid");
+        excludeFields.add("shape_leng");
+    }
+
     /**
      * 鑾峰彇琛ㄥ悕
      */
@@ -28,11 +35,15 @@
         List<String> list = new ArrayList<>();
         try {
             org.gdal.ogr.Driver driver = ogr.GetDriverByName("OpenFileGDB");
-            if (driver == null) {
+            if (null == driver) {
                 return list;
             }
 
             DataSource 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());
@@ -40,6 +51,7 @@
                 layer.delete();
             }
 
+            dataSource.delete();
             driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -55,11 +67,15 @@
         List<T> list = new ArrayList<>();
         try {
             org.gdal.ogr.Driver driver = ogr.GetDriverByName("OpenFileGDB");
-            if (driver == null) {
+            if (null == driver) {
                 return list;
             }
 
             DataSource 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);
 
@@ -71,6 +87,7 @@
                 layer.delete();
             }
 
+            dataSource.delete();
             driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -87,6 +104,9 @@
             Field gField = getGeomField(clazz);
             Map<Integer, Field> map = getFieldMapper(clazz, layer);
             if (map.size() == 0) {
+                return;
+            }
+            if (1 > layer.GetFeatureCount()) {
                 return;
             }
 
@@ -136,7 +156,7 @@
                 FieldDefn fieldDefn = fd.GetFieldDefn(i);
                 try {
                     String name = fieldDefn.GetName().toLowerCase();
-                    if ("gid".equals(name)) {
+                    if (excludeFields.contains(name)){
                         continue;
                     }
 
@@ -204,7 +224,7 @@
 
     /**
      * 璁剧疆 geom 瀛楁鍊�
-     *
+     * <p>
      * wkbUnknown = 0,
      * wkbPoint = 1,
      * wkbLineString = 2,
@@ -222,10 +242,10 @@
             String wkt = geometry.ExportToWkt();
             switch (geometry.GetGeometryType()) {
                 case 2:
-                    wkt = wkt.replace("LINESTRING (", "MultiLINESTRING ((") + ")";
+                    wkt = wkt.replace("LINESTRING (", "MULTILINESTRING ((") + ")";
                     break;
                 case 3:
-                    wkt = wkt.replace("POLYGON (", "LINESTRINGPOLYGON ((") + ")";
+                    wkt = wkt.replace("POLYGON (", "MULTIPOLYGON ((") + ")";
                     break;
                 default:
                     break;

--
Gitblit v1.9.3