From 2d2d9138fbe5c9c43f070be59a2d10f18fbf4c3b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 09:05:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/AccessHelper.java | 9 +++++++++
src/main/java/com/lf/server/helper/ShpHelper.java | 6 +++++-
src/main/java/com/lf/server/helper/GdbHelper.java | 12 ++++++++++--
pom.xml | 6 ++++++
src/main/java/com/lf/server/helper/MdbHelper.java | 14 +++++++++++---
5 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index fafb69c..28e7cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,12 @@
<artifactId>easyexcel</artifactId>
<version>2.2.10</version>
</dependency>
+ <!--access-->
+ <dependency>
+ <groupId>net.sf.ucanaccess</groupId>
+ <artifactId>ucanaccess</artifactId>
+ <version>5.0.1</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/lf/server/helper/AccessHelper.java b/src/main/java/com/lf/server/helper/AccessHelper.java
new file mode 100644
index 0000000..19d3b3f
--- /dev/null
+++ b/src/main/java/com/lf/server/helper/AccessHelper.java
@@ -0,0 +1,9 @@
+package com.lf.server.helper;
+
+/**
+ * Access甯姪绫�
+ * @author WWW
+ */
+public class AccessHelper {
+ //
+}
diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index 57341fd..48d1d14 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -35,11 +35,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());
@@ -63,11 +67,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);
diff --git a/src/main/java/com/lf/server/helper/MdbHelper.java b/src/main/java/com/lf/server/helper/MdbHelper.java
index 3fb1942..71bb0fe 100644
--- a/src/main/java/com/lf/server/helper/MdbHelper.java
+++ b/src/main/java/com/lf/server/helper/MdbHelper.java
@@ -23,11 +23,15 @@
List<String> list = new ArrayList<>();
try {
org.gdal.ogr.Driver driver = ogr.GetDriverByName("PGeo");
- 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());
@@ -51,15 +55,19 @@
List<T> list = new ArrayList<>();
try {
org.gdal.ogr.Driver driver = ogr.GetDriverByName("PGeo");
- 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);
- if (layer.GetName().equals(layerName)){
+ if (layer.GetName().equals(layerName)) {
GdbHelper.readLayer(clazz, layer, list);
break;
}
diff --git a/src/main/java/com/lf/server/helper/ShpHelper.java b/src/main/java/com/lf/server/helper/ShpHelper.java
index 1434621..0db87a4 100644
--- a/src/main/java/com/lf/server/helper/ShpHelper.java
+++ b/src/main/java/com/lf/server/helper/ShpHelper.java
@@ -201,11 +201,15 @@
List<T> list = new ArrayList<>();
try {
org.gdal.ogr.Driver driver = ogr.GetDriverByName("ESRI shapefile");
- if (driver == null) {
+ if (null == driver) {
return list;
}
DataSource dataSource = driver.Open(filePath);
+ if (null == dataSource) {
+ return list;
+ }
+
Layer layer = dataSource.GetLayer(0);
GdbHelper.readLayer(clazz, layer, list);
--
Gitblit v1.9.3