From e782fd07af69d056d0b0258e9dd9dc23e2cc98fe Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 13:41:40 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdbHelper.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index a70f1a0..6398ea7 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,6 +18,8 @@
 public class GdbHelper {
     private final static Log log = LogFactory.getLog(GdbHelper.class);
 
+    public static List<String> excludeFields = new ArrayList<>(Arrays.asList("gid", "shape_leng"));
+
     /**
      * 鑾峰彇琛ㄥ悕
      */
@@ -28,11 +27,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 +43,7 @@
                 layer.delete();
             }
 
+            dataSource.delete();
             driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -55,11 +59,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 +79,7 @@
                 layer.delete();
             }
 
+            dataSource.delete();
             driver.delete();
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -87,6 +96,9 @@
             Field gField = getGeomField(clazz);
             Map<Integer, Field> map = getFieldMapper(clazz, layer);
             if (map.size() == 0) {
+                return;
+            }
+            if (1 > layer.GetFeatureCount()) {
                 return;
             }
 
@@ -135,7 +147,12 @@
             for (int i = 0, count = fd.GetFieldCount(); i < count; i++) {
                 FieldDefn fieldDefn = fd.GetFieldDefn(i);
                 try {
-                    Field field = clazz.getDeclaredField(fieldDefn.GetName().toLowerCase());
+                    String name = fieldDefn.GetName().toLowerCase();
+                    if (excludeFields.contains(name)){
+                        continue;
+                    }
+
+                    Field field = clazz.getDeclaredField(name);
                     field.setAccessible(true);
 
                     map.put(i, field);
@@ -199,11 +216,34 @@
 
     /**
      * 璁剧疆 geom 瀛楁鍊�
+     * <p>
+     * wkbUnknown = 0,
+     * wkbPoint = 1,
+     * wkbLineString = 2,
+     * wkbPolygon = 3,
+     * wkbMultiPoint = 4,
+     * wkbMultiLineString = 5,
+     * wkbMultiPolygon = 6,
+     * wkbGeometryCollection = 7,
+     * wkbNone = 100,
+     * wkbLinearRing = 101
      */
     private static <T> void setGeom(T t, Feature f, Field gField) throws Exception {
         Geometry geometry = f.GetGeometryRef();
         if (null != geometry) {
-            gField.set(t, geometry.ExportToWkt());
+            String wkt = geometry.ExportToWkt();
+            switch (geometry.GetGeometryType()) {
+                case 2:
+                    wkt = wkt.replace("LINESTRING (", "MULTILINESTRING ((") + ")";
+                    break;
+                case 3:
+                    wkt = wkt.replace("POLYGON (", "MULTIPOLYGON ((") + ")";
+                    break;
+                default:
+                    break;
+            }
+
+            gField.set(t, String.format("ST_GeomFromText('%s')", wkt));
         }
     }
 

--
Gitblit v1.9.3