From b6b0cb226fcf184525ee7b36af3a09471e9c0057 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 11:29:33 +0800
Subject: [PATCH] 修改数据统计的查询条件

---
 src/main/java/com/lf/server/helper/GdalHelper.java |  151 +++++++++-----------------------------------------
 1 files changed, 27 insertions(+), 124 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index 5d64ca8..c03235f 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -1,7 +1,5 @@
 package com.lf.server.helper;
 
-import com.lf.server.entity.ctrl.MarkJsonEntity;
-import com.lf.server.entity.ctrl.ShpRecordEntity;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.gdal.gdal.Band;
@@ -31,125 +29,30 @@
 public class GdalHelper {
     private final static Log log = LogFactory.getLog(GdalHelper.class);
 
-    static {
+    public static void init(String gdalPath) {
+        // 鏀寔涓枃璺緞
+        gdal.SetConfigOption("GDAL_FILENAME_IS_UTF8", "YES");
+        // 灞炴�ц〃鏀寔涓枃锛欳P936
+        gdal.SetConfigOption("SHAPE_ENCODING", "");
+        gdal.SetConfigOption("PGEO_DRIVER_TEMPLATE", "DRIVER=Microsoft Access Driver (*.mdb, *.accdb);DBQ=%s");
+        gdal.SetConfigOption("MDB_DRIVER_TEMPLATE", "DRIVER=Microsoft Access Driver (*.mdb, *.accdb);DBQ=%s");
+
+        // 閰嶇疆鐜鍙橀噺
+        if (!StringHelper.isEmpty(gdalPath)) {
+            gdal.SetConfigOption("GDAL_DATA", gdalPath + File.separator + "gdal-data");
+            gdal.SetConfigOption("PROJ_LIB", gdalPath + File.separator + "proj7" + File.separator + "share");
+            //System.setProperty("PROJ_LIB", gdalPath + File.separator + "proj7" + File.separator + "share")
+            gdal.SetConfigOption("GDAL_DRIVER_PATH", gdalPath + File.separator + "gdalplugins");
+
+            String path = System.getenv("PATH");
+            if (!path.contains(gdalPath)) {
+                System.setProperty("PATH", path + ";" + gdalPath);
+            }
+        }
+
         // 娉ㄥ唽鎵�鏈夌殑椹卞姩
         gdal.AllRegister();
-
-        // 涓轰簡鏀寔涓枃璺緞锛岃娣诲姞涓嬮潰杩欏彞浠g爜
-        gdal.SetConfigOption("GDAL_FILENAME_IS_UTF8", "YES");
-
-        // 閰嶇疆GDAL_DATA璺緞锛坓dal鏍圭洰褰曚笅鐨刡in\gdal-data锛�
-        // gdal.SetConfigOption("GDAL_DATA", "E:\\terrait\\TianJin\\Zip\\release-1928-x64-dev\\release-1928-x64\\bin\\gdal-data");
-        // gdal.SetConfigOption("PROJ_LIB", "E:\\terrait\\TianJin\\Zip\\release-1928-x64-dev\\release-1928-x64\\bin\\proj7\\share");
-
-        // 涓轰簡浣垮睘鎬ц〃瀛楁鏀寔涓枃锛岃娣诲姞涓嬮潰杩欏彞锛欳P936
-        gdal.SetConfigOption("SHAPE_ENCODING", "");
-    }
-
-    /**
-     * 璇诲彇Shp绗竴鏉¤褰曠殑WKT
-     */
-    public static ShpRecordEntity readShpFirstRecord(String filePath) {
-        try {
-            org.gdal.ogr.Driver driver = ogr.GetDriverByName("ESRI shapefile");
-            if (driver == null) {
-                return null;
-            }
-
-            DataSource dataSource = driver.Open(filePath);
-            Layer layer = dataSource.GetLayer(0);
-            if (layer.GetFeatureCount() < 1) {
-                return null;
-            }
-
-            SpatialReference spatialReference = layer.GetSpatialRef();
-            String csid = spatialReference.GetAttrValue("AUTHORITY", 1);
-
-            Feature feature = layer.GetFeature(0);
-            String wkt = feature.GetGeometryRef().ExportToWkt();
-
-            layer.delete();
-            dataSource.delete();
-            driver.delete();
-
-            return new ShpRecordEntity(wkt, csid);
-        } catch (Exception ex) {
-            log.error(ex.getMessage(), ex);
-            return null;
-        }
-    }
-
-    /**
-     * 鍒涘缓ShapeFile鏂囦欢
-     *
-     * @param list 鏍囩粯JSON瀹炰綋绫婚泦鍚�
-     * @param path 璺緞
-     * @param type 绫诲瀷锛歅OINT,LINESTRING,POLYGON
-     * @return ShapeFile鏂囦欢鍚�
-     */
-    public static String createShp(List<MarkJsonEntity> list, String path, String type) {
-        try {
-            org.gdal.ogr.Driver driver = ogr.GetDriverByName("ESRI shapefile");
-            if (driver == null) {
-                return null;
-            }
-
-            String filePath = path + File.separator + type.toLowerCase() + ".shp";
-            //DataSource ds = driver.Open(filePath, 0);
-            DataSource ds = driver.CreateDataSource(filePath, null);
-
-            SpatialReference sr = new SpatialReference();
-            sr.ImportFromEPSG(4326);
-
-            int geoType = getGeometryType(type);
-            Layer layer = ds.CreateLayer(type.toLowerCase(), sr, geoType);
-
-            FieldDefn fdName = new FieldDefn("name", ogr.OFTString);
-            fdName.SetWidth(50);
-            layer.CreateField(fdName, 0);
-
-            FieldDefn fdProps = new FieldDefn("props", ogr.OFTString);
-            fdProps.SetWidth(1024);
-            // layer.DeleteField(layer.FindFieldIndex("name", 1));
-            layer.CreateField(fdProps, 1);
-
-            FeatureDefn featureDefn = layer.GetLayerDefn();
-            for (MarkJsonEntity mje : list) {
-                Geometry geo = Geometry.CreateFromWkt(mje.getWkt());
-
-                Feature f = new Feature(featureDefn);
-                f.SetField(0, mje.getName());
-                f.SetField(1, mje.getProps());
-                f.SetGeometry(geo);
-
-                layer.CreateFeature(f);
-            }
-
-            layer.delete();
-            ds.delete();
-            driver.delete();
-
-            return filePath;
-        } catch (Exception ex) {
-            log.error(ex.getMessage(), ex);
-            return null;
-        }
-    }
-
-    /**
-     * 鑾峰彇鍥惧舰绫诲瀷
-     */
-    private static int getGeometryType(String type) {
-        switch (type) {
-            case "POINT":
-                return 1;
-            case "LINESTRING":
-                return 2;
-            case "POLYGON":
-                return 3;
-            default:
-                return -1;
-        }
+        ogr.RegisterAll();
     }
 
     /**
@@ -238,7 +141,7 @@
                 break;
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
+            log.error(ex.getMessage(), ex);
         }
     }
 
@@ -301,8 +204,8 @@
                 //layerDto.setCount(count);
                 //layerDto.setMap(mapList);
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
         } finally {
             if (dataSource != null) {
                 dataSource.delete();
@@ -347,11 +250,11 @@
                 } while (true);
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
+            log.error(ex.getMessage(), ex);
         }
     }
 
-    private static Object getProperty(Feature feature, int index) {
+    public static Object getProperty(Feature feature, int index) {
         int type = feature.GetFieldType(index);
 
         PropertyGetter propertyGetter;

--
Gitblit v1.9.3