From 7e754e7bdbdb8b2c3086938a67421aebab2fb493 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 20:48:35 +0800
Subject: [PATCH] 12.29.7

---
 src/main/java/com/lf/server/helper/GdbHelper.java |  105 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index fc94c14..9113861 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -24,8 +24,6 @@
 public class GdbHelper {
     private final static Log log = LogFactory.getLog(GdbHelper.class);
 
-    private final static String OBJECT = "java.lang.Object";
-
     /**
      * 閿�姣佽祫婧�
      */
@@ -209,7 +207,7 @@
                 }
             }
 
-            if (!OBJECT.equals(clazz.getSuperclass().getName())) {
+            if (!StaticData.OBJECT.equals(clazz.getSuperclass().getName())) {
                 getFieldMapper(clazz.getSuperclass(), layer, map);
             }
         } catch (Exception ex) {
@@ -288,7 +286,11 @@
         String geo = "null";
         if (null != f.GetGeometryRef()) {
             String wkt = f.GetGeometryRef().ExportToWkt();
+            // noinspection AlibabaRemoveCommentedCode
             switch (f.GetGeometryRef().GetGeometryType()) {
+                //case 1:
+                //    wkt = wkt.replace("POINT", "MULTIPOINT");
+                //    break;
                 case 2:
                     wkt = wkt.replace("LINESTRING (", "MULTILINESTRING ((") + ")";
                     break;
@@ -422,7 +424,7 @@
 
         Integer srid = baseMapper.selectSrid(tab);
         SpatialReference sr = new SpatialReference();
-        sr.ImportFromEPSG(null == srid ? 4326 : srid);
+        sr.ImportFromEPSG(null == srid ? 4490 : srid);
 
         return dataSource.CreateLayer(tab, sr, getGeomType(geomType), null);
     }
@@ -438,6 +440,8 @@
         switch (geomType) {
             case "ST_Point":
                 return ogr.wkbPoint;
+            case "ST_MultiPoint":
+                return ogr.wkbMultiPoint;
             case "ST_LineString":
                 return ogr.wkbLineString;
             case "ST_MultiLineString":
@@ -466,7 +470,7 @@
                 list.add(f);
             }
 
-            if (!OBJECT.equals(clazz.getSuperclass().getName())) {
+            if (!StaticData.OBJECT.equals(clazz.getSuperclass().getName())) {
                 getFields(clazz.getSuperclass(), list);
             }
         } catch (Exception ex) {
@@ -477,7 +481,7 @@
     /**
      * 娣诲姞鍥惧眰瀛楁
      */
-    private static void addLayerField(Layer layer, List<Field> list) {
+    public static void addLayerField(Layer layer, List<Field> list) {
         for (int i = 0, c = list.size(); i < c; i++) {
             Field f = list.get(i);
 
@@ -523,52 +527,59 @@
             Geometry geom = Geometry.CreateFromWkt(geoEntity.getGeom());
             f.SetGeometry(geom);
 
-            for (int i = 0, 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":
-                        BigDecimal big = (BigDecimal) val;
-                        f.SetField(i, big.doubleValue());
-                        break;
-                    case "java.lang.Double":
-                    case "double":
-                        double d = (double) val;
-                        f.SetField(i, d);
-                        break;
-                    case "java.lang.Long":
-                    case "long":
-                        long l = (long) val;
-                        f.SetField(i, l);
-                        break;
-                    case "java.lang.Integer":
-                    case "int":
-                        int n = (int) val;
-                        f.SetField(i, n);
-                        break;
-                    case "java.sql.Timestamp":
-                        Timestamp timestamp = (Timestamp) field.get(t);
-                        setTimestamp(f, i, timestamp);
-                        break;
-                    case "java.time.LocalDate":
-                        LocalDate localDate = (LocalDate) field.get(t);
-                        setLocalDate(f, i, localDate);
-                        break;
-                    default:
-                        String str = (String) val;
-                        f.SetField(i, str);
-                        break;
-                }
-            }
+            setFeatureData(f, fields, t);
             layer.CreateFeature(f);
         }
     }
 
     /**
+     * 璁剧疆瑕佺礌鐨勬暟鎹�
+     */
+    public static <T> void setFeatureData(Feature f, List<Field> fields, T t) throws Exception {
+        for (int i = 0, 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":
+                    BigDecimal big = (BigDecimal) val;
+                    f.SetField(i, big.doubleValue());
+                    break;
+                case "java.lang.Double":
+                case "double":
+                    double d = (double) val;
+                    f.SetField(i, d);
+                    break;
+                case "java.lang.Long":
+                case "long":
+                    long l = (long) val;
+                    f.SetField(i, l);
+                    break;
+                case "java.lang.Integer":
+                case "int":
+                    int n = (int) val;
+                    f.SetField(i, n);
+                    break;
+                case "java.sql.Timestamp":
+                    Timestamp timestamp = (Timestamp) field.get(t);
+                    setTimestamp(f, i, timestamp);
+                    break;
+                case "java.time.LocalDate":
+                    LocalDate localDate = (LocalDate) field.get(t);
+                    setLocalDate(f, i, localDate);
+                    break;
+                default:
+                    String str = (String) val;
+                    f.SetField(i, str);
+                    break;
+            }
+        }
+    }
+
+    /**
      * 璁剧疆Timestamp
      */
     private static void setTimestamp(Feature f, int i, Timestamp time) {

--
Gitblit v1.9.3