From c9190af38fd6fd9e71ca7db2b343e3a79f24ff5c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 16:23:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/GdbHelper.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index bfabbcd..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,12 +18,7 @@
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");
- }
+ public static List<String> excludeFields = new ArrayList<>(Arrays.asList("gid", "shape_leng"));
/**
* 鑾峰彇琛ㄥ悕
@@ -35,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());
@@ -47,6 +43,7 @@
layer.delete();
}
+ dataSource.delete();
driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -62,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);
@@ -78,6 +79,7 @@
layer.delete();
}
+ dataSource.delete();
driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -96,6 +98,9 @@
if (map.size() == 0) {
return;
}
+ if (1 > layer.GetFeatureCount()) {
+ return;
+ }
do {
Feature f = layer.GetNextFeature();
--
Gitblit v1.9.3