From 24a09196ed7c1ae7502dc64264469a2de03389aa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 21 十一月 2022 18:54:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/ShpHelper.java | 6 +++++-
src/main/java/com/lf/server/service/data/DataLoaderService.java | 12 +++++-------
src/main/java/com/lf/server/helper/ExcelHelper.java | 1 -
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/ExcelHelper.java b/src/main/java/com/lf/server/helper/ExcelHelper.java
index 6eba6ad..3aed0eb 100644
--- a/src/main/java/com/lf/server/helper/ExcelHelper.java
+++ b/src/main/java/com/lf/server/helper/ExcelHelper.java
@@ -51,7 +51,6 @@
reader.read(sheet);
}
-
return list;
}
diff --git a/src/main/java/com/lf/server/helper/ShpHelper.java b/src/main/java/com/lf/server/helper/ShpHelper.java
index 9a94d5a..98bd1d6 100644
--- a/src/main/java/com/lf/server/helper/ShpHelper.java
+++ b/src/main/java/com/lf/server/helper/ShpHelper.java
@@ -194,9 +194,13 @@
}
}
- public static <T> List<T> readData(Class clazz,String filePath) {
+ public static <T> List<T> readData(Class clazz, String filePath) {
List<T> list = new ArrayList<>();
+ try {
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
return list;
}
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 0ce285b..ec3c55e 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -340,7 +340,7 @@
*/
private void insertXls(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
TabMapperEntity tab = getTabEntity(mfe, tabs);
- if (null == tab|| StringHelper.isEmpty(tab.getEntity())) {
+ if (null == tab || StringHelper.isEmpty(tab.getEntity())) {
return;
}
@@ -356,7 +356,7 @@
}
List<?> list = ExcelHelper.readExcel(clazz, root + File.separator + mfe.getPath());
- if (null == list || list.isEmpty()) {
+ if (list.isEmpty()) {
return;
}
setCreateInfo(list, mfe);
@@ -366,8 +366,7 @@
rows += basicMapper.insert(list.get(i));
}
if (basicMapper instanceof GeomBaseMapper) {
- GeomBaseMapper geomBaseMapper = (GeomBaseMapper) basicMapper;
- updateXlsGeom(geomBaseMapper, list);
+ updateXlsGeom((GeomBaseMapper) basicMapper, list);
}
tab.setRows(rows);
@@ -452,15 +451,14 @@
}
List<?> list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
- if (null == list || list.isEmpty()) {
+ if (list.isEmpty()) {
continue;
}
setCreateInfo(list, mfe);
Integer rows = basicMapper.insertBatch(list);
if (basicMapper instanceof GeomBaseMapper) {
- GeomBaseMapper geomBaseMapper = (GeomBaseMapper) basicMapper;
- updateXlsGeom(geomBaseMapper, list);
+ updateDbGeom((GeomBaseMapper) basicMapper, list);
}
tab.setRows(rows);
--
Gitblit v1.9.3