From f7b5d34d998461b78dbadf7fe03db257bc41a39f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 六月 2023 15:50:18 +0800
Subject: [PATCH] 添加 isTransform 参数
---
src/main/java/com/lf/server/helper/ShpHelper.java | 4 ++--
src/main/java/com/lf/server/service/data/UploadService.java | 6 +++---
data/db_cx.sql | 5 +++++
src/main/java/com/lf/server/helper/GdbHelper.java | 6 +++---
src/main/java/com/lf/server/helper/MdbHelper.java | 2 +-
src/main/resources/application.yml | 8 ++++----
6 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index aec0a4d..a0ebd1f 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -56,6 +56,11 @@
alter table bs.dlg_resnt2000 alter column floors type varchar(20);
select * from lf.sys_layer l where cn_name='鍊炬枩鎽勫奖鏁版嵁';
+select id, pid, type, cn_name, en_name, url, serve_type, data_type, elev, pubid, is_project, bak from lf.sys_layer order by id; -- 8-299
+-- update lf.sys_layer set is_project = 1 where id between 8 and 299;
+update lf.sys_layer set is_project = null where id between 8 and 299 and type = 1;
+
+
diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index e8ac509..b6120b1 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -107,7 +107,7 @@
/**
* 璇诲彇鏁版嵁
*/
- public static <T> List<T> readData(Class clazz, String filePath, String layerName) {
+ public static <T> List<T> readData(Class clazz, String filePath, String layerName, boolean isTransform) {
List<T> list = new ArrayList<>();
Driver driver = null;
@@ -127,7 +127,7 @@
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);
+ GdbHelper.readLayer(clazz, layer, list, isTransform);
break;
}
@@ -145,7 +145,7 @@
/**
* 璇诲彇鍥惧眰
*/
- public static <T> void readLayer(Class clazz, Layer layer, List<T> list) {
+ public static <T> void readLayer(Class clazz, Layer layer, List<T> list, boolean isTransform) {
try {
Field gField = getGeomField(clazz);
diff --git a/src/main/java/com/lf/server/helper/MdbHelper.java b/src/main/java/com/lf/server/helper/MdbHelper.java
index 535896b..1bae666 100644
--- a/src/main/java/com/lf/server/helper/MdbHelper.java
+++ b/src/main/java/com/lf/server/helper/MdbHelper.java
@@ -75,7 +75,7 @@
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);
+ GdbHelper.readLayer(clazz, layer, list, true);
break;
}
diff --git a/src/main/java/com/lf/server/helper/ShpHelper.java b/src/main/java/com/lf/server/helper/ShpHelper.java
index c953132..0dda7bc 100644
--- a/src/main/java/com/lf/server/helper/ShpHelper.java
+++ b/src/main/java/com/lf/server/helper/ShpHelper.java
@@ -214,7 +214,7 @@
/**
* 璇诲彇鏁版嵁
*/
- public static <T> List<T> readData(Class clazz, String filePath) {
+ public static <T> List<T> readData(Class clazz, String filePath, boolean isTransform) {
List<T> list = new ArrayList<>();
Driver driver = null;
@@ -231,7 +231,7 @@
}
Layer layer = dataSource.GetLayer(0);
- GdbHelper.readLayer(clazz, layer, list);
+ GdbHelper.readLayer(clazz, layer, list, isTransform);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
} finally {
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 9c6f776..3efcf9d 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -228,9 +228,9 @@
List<?> list;
if (StaticData.SHP.equals(mf.getExtName())) {
- list = ShpHelper.readData(clazz, mf.getPath());
+ list = ShpHelper.readData(clazz, mf.getPath(), true);
} else {
- list = GdbHelper.readData(clazz, mf.getPath(), mf.getTab());
+ list = GdbHelper.readData(clazz, mf.getPath(), mf.getTab(), true);
}
if (null == list || list.isEmpty()) {
return;
@@ -249,7 +249,7 @@
/**
* 鎵归噺鎻掑叆
*/
- private <T> int batchInserts(BasicMapper basicMapper, List<T> list) {
+ private <T> int batchInserts(BasicMapper basicMapper, List<T> list) {
int rows = 0;
//int count = (int) Math.ceil(list.size() / StaticData.D100)
List<List<T>> subLists = Lists.partition(list, StaticData.I50);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 42a9db7..20bbeb3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,11 +43,11 @@
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
#url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
- url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
- #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
- password: Postgres!_14_Lf
- #password: postgres
+ #password: Postgres!_14_Lf
+ password: postgres
driver-class-name: org.postgresql.Driver
platform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.3