From 7e80ca95f631ecbce3d7de1b89f62d4f6de6d58f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 26 十一月 2022 09:54:36 +0800
Subject: [PATCH] q
---
src/main/java/com/lf/server/helper/GdbHelper.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index 11a27f9..115776a 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -21,17 +21,62 @@
public static List<String> excludeFields = new ArrayList<>(Arrays.asList("gid", "shape_leng"));
/**
+ * 閿�姣佽祫婧�
+ */
+ public static void delete(Layer layer) {
+ try {
+ if (null != layer) {
+ layer.delete();
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ /**
+ * 閿�姣佽祫婧�
+ */
+ public static void delete(DataSource dataSource, Driver driver) {
+ try {
+ if (null != dataSource) {
+ dataSource.delete();
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+
+ try {
+ if (null != driver) {
+ driver.delete();
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ /**
+ * 閿�姣佽祫婧�
+ */
+ public static void delete(Layer layer, DataSource dataSource, Driver driver) {
+ delete(layer);
+ delete(dataSource, driver);
+ }
+
+ /**
* 鑾峰彇琛ㄥ悕
*/
public static List<String> getTabNames(String filePath) {
List<String> list = new ArrayList<>();
+
+ Driver driver = null;
+ DataSource dataSource = null;
try {
- org.gdal.ogr.Driver driver = ogr.GetDriverByName("OpenFileGDB");
+ driver = ogr.GetDriverByName("OpenFileGDB");
if (null == driver) {
return list;
}
- DataSource dataSource = driver.Open(filePath, 0);
+ dataSource = driver.Open(filePath, 0);
if (null == dataSource) {
return list;
}
@@ -42,11 +87,10 @@
layer.delete();
}
-
- dataSource.delete();
- driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
+ } finally {
+ GdbHelper.delete(dataSource, driver);
}
return list;
@@ -57,20 +101,22 @@
*/
public static <T> List<T> readData(Class clazz, String filePath, String layerName) {
List<T> list = new ArrayList<>();
+
+ Driver driver = null;
+ DataSource dataSource = null;
try {
- org.gdal.ogr.Driver driver = ogr.GetDriverByName("OpenFileGDB");
+ driver = ogr.GetDriverByName("OpenFileGDB");
if (null == driver) {
return list;
}
- DataSource dataSource = driver.Open(filePath, 0);
+ 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);
-
if (layer.GetName().equals(layerName)) {
GdbHelper.readLayer(clazz, layer, list);
break;
@@ -78,11 +124,10 @@
layer.delete();
}
-
- dataSource.delete();
- driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
+ } finally {
+ GdbHelper.delete(dataSource, driver);
}
return list;
@@ -116,9 +161,7 @@
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
} finally {
- if (null != layer) {
- layer.delete();
- }
+ GdbHelper.delete(layer);
}
}
@@ -271,8 +314,6 @@
LocalTime.of(pnHour[0], pnMinute[0], s, ns)
);
- Timestamp timestamp = Timestamp.valueOf(localDateTime);
-
- return timestamp;
+ return Timestamp.valueOf(localDateTime);
}
}
--
Gitblit v1.9.3