From f31782b273aeb8752b25d5467502e8ea38e083c7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 20 十二月 2022 10:17:51 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdbHelper.java |   45 ++++++++++++++++++++-------------------------
 1 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index 854a787..6b73111 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -330,12 +330,11 @@
         Driver driver = null;
         DataSource dataSource = null;
         try {
-            driver = ogr.GetDriverByName("OpenFileGDB");
+            driver = ogr.GetDriverByName("FileGDB");
             if (null == driver) {
                 return;
             }
-
-            dataSource = driver.CreateDataSource(filePath);
+            dataSource = driver.CreateDataSource(filePath, null);
             if (null == dataSource) {
                 return;
             }
@@ -354,12 +353,12 @@
 
                     String className = ClassHelper.getClassName(baseMapper);
                     Class clazz = ClassHelper.getEntityClass(className);
-                    Field gField = getGeomField(clazz);
-                    if (null == gField) {
+                    if (null == clazz) {
                         continue;
                     }
 
                     List<Field> fields = new ArrayList<>();
+                    fields.add(getGeomField(clazz));
                     getFields(clazz, fields);
                     addLayerField(layer, fields);
 
@@ -454,22 +453,14 @@
      * 娣诲姞鍥惧眰瀛楁
      */
     private static void addLayerField(Layer layer, List<Field> list) {
-        for (int i = 0, c = list.size(); i < c; i++) {
+        for (int i = 1, c = list.size(); i < c; i++) {
             Field f = list.get(i);
-            FieldDefn fd = getLayerField(f);
+
+            int fieldType = getFieldType(f);
+            FieldDefn fd = new FieldDefn(f.getName(), fieldType);
+
             layer.CreateField(fd, i);
         }
-    }
-
-    private static FieldDefn getLayerField(Field f ) {
-        int fieldType = getFieldType(f);
-        FieldDefn fd = new FieldDefn(f.getName(), fieldType);
-
-        if (fieldType == ogr.OFTString) {
-            // fd.SetWidth(100)
-        }
-
-        return fd;
     }
 
     /**
@@ -505,36 +496,40 @@
             Geometry geom = Geometry.CreateFromWkt(geoEntity.getGeom());
             f.SetGeometry(geom);
 
-            for (int i = 0, c = fields.size(); i < c; i++) {
+            for (int i = 1, c = fields.size(); i < c; i++) {
                 Field field = fields.get(i);
+                Object val = field.get(t);
+                if (null == val) {
+                    continue;
+                }
+
                 switch (field.getType().getName()) {
                     case "java.math.BigDecimal":
                     case "java.lang.Double":
                     case "double":
-                        Double d = field.getDouble(t);
+                        double d = (double) val;
                         f.SetField(i, d);
                         break;
                     case "java.lang.Long":
                     case "long":
-                        Long l = field.getLong(t);
+                        long l = (long) val;
                         f.SetField(i, l);
                         break;
                     case "java.lang.Integer":
                     case "int":
-                        Integer n = field.getInt(t);
+                        int n = (int) val;
                         f.SetField(i, n);
                         break;
                     case "java.sql.Timestamp":
-                        Timestamp time = null == field.get(t) ? null : (Timestamp) field.get(t);
+                        Timestamp time = (Timestamp) field.get(t);
                         setTimestamp(f, i, time);
                         break;
                     default:
-                        String str = null == field.get(t) ? null : (String) field.get(t);
+                        String str = (String) val;
                         f.SetField(i, str);
                         break;
                 }
             }
-
             layer.CreateFeature(f);
         }
     }

--
Gitblit v1.9.3