From d28331603c9dee06e34b0f4240b5e0135ff66466 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 十一月 2022 21:12:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/ShpHelper.java | 1 +
data/db_fn.sql | 5 ++---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 6 ++++--
src/main/java/com/lf/server/helper/GdbHelper.java | 5 +++++
src/main/java/com/lf/server/helper/MdbHelper.java | 2 ++
src/main/java/com/lf/server/helper/ExcelHelper.java | 1 +
6 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index a2b3e3e..a3bb2ca 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -331,9 +331,8 @@
select st_srid(geom) from bd.dlg_25w_boul limit 1;
select * from lf.sys_dict where ns='bd' and tab='dlg_25w_boul' and field='geom';
-
-
-
+select * from lf.sys_meta; -- delete from lf.sys_meta;
+select * from lf.sys_meta_file; -- delete from lf.sys_meta_file;
diff --git a/src/main/java/com/lf/server/helper/ExcelHelper.java b/src/main/java/com/lf/server/helper/ExcelHelper.java
index 3aed0eb..014463d 100644
--- a/src/main/java/com/lf/server/helper/ExcelHelper.java
+++ b/src/main/java/com/lf/server/helper/ExcelHelper.java
@@ -50,6 +50,7 @@
reader.read(sheet);
}
+ reader.finish();
return list;
}
diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index bfabbcd..57341fd 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -47,6 +47,7 @@
layer.delete();
}
+ dataSource.delete();
driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -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();
diff --git a/src/main/java/com/lf/server/helper/MdbHelper.java b/src/main/java/com/lf/server/helper/MdbHelper.java
index 66c99f5..3fb1942 100644
--- a/src/main/java/com/lf/server/helper/MdbHelper.java
+++ b/src/main/java/com/lf/server/helper/MdbHelper.java
@@ -35,6 +35,7 @@
layer.delete();
}
+ dataSource.delete();
driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -66,6 +67,7 @@
layer.delete();
}
+ dataSource.delete();
driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
diff --git a/src/main/java/com/lf/server/helper/ShpHelper.java b/src/main/java/com/lf/server/helper/ShpHelper.java
index 03baa7a..1434621 100644
--- a/src/main/java/com/lf/server/helper/ShpHelper.java
+++ b/src/main/java/com/lf/server/helper/ShpHelper.java
@@ -210,6 +210,7 @@
GdbHelper.readLayer(clazz, layer, list);
+ dataSource.delete();
driver.delete();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 6846f09..efe5704 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -211,11 +211,11 @@
public void insertFiles(MetaEntity entity, List<MetaFileEntity> list, List<TabMapperEntity> tabList) {
try {
String temp = pathHelper.getConfig().getTempPath();
- String root = pathHelper.getConfig().getUploadPath();
+ String upload = pathHelper.getUploadFullPath();
for (MetaFileEntity mf : list) {
File file = new File(temp + File.separator + mf.getPath());
- File newFile = new File(root + File.separator + mf.getGuid());
+ File newFile = new File(upload + File.separator + mf.getGuid());
String type = getType(mf.getName().toLowerCase());
if (null == type) {
@@ -327,6 +327,8 @@
me.setDescr(entity.getDescr());
me.setName(mf.getName());
me.setSizes(mf.getSizes());
+ me.setTab(tab);
+ me.setRows(rows);
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
--
Gitblit v1.9.3