From 4ca77edbe07508f1bd4a878c7c00d7b7fbf0abb5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 六月 2023 13:57:34 +0800
Subject: [PATCH] 数据上传添加矢量数据入库的错误记录数
---
src/main/java/com/lf/server/entity/data/MetaFileEntity.java | 10 ++++++++++
src/main/java/com/lf/server/service/data/UploadService.java | 5 +++--
data/db_cx.sql | 4 ++++
data/update.sql | 4 ++--
src/main/java/com/lf/server/entity/ctrl/PubEntity.java | 20 ++++++++++----------
src/main/resources/application.yml | 2 +-
6 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 14933a3..aec0a4d 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -54,6 +54,10 @@
select * from bs.dlg_resnt2000;
alter table bs.dlg_resnt2000 alter column floors type varchar(20);
+select * from lf.sys_layer l where cn_name='鍊炬枩鎽勫奖鏁版嵁';
+
+
+
diff --git a/data/update.sql b/data/update.sql
index c2adf2f..a71e683 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -220,12 +220,12 @@
-- 椤圭洰琛�
select a.*,st_astext(geom) from bs.bs_project a;
--- 鎸夐」鐩粺璁℃暟鎹�
+-- 鎸夐」鐩粺璁℃暟鎹� *
select name "鍚嶇О", (select count(*) from lf.sys_meta b where b.dircode like a.code || '%') "鏂囦欢鏁�",
(select sum(sizes) from lf.sys_meta b where b.dircode like a.code || '%') "鏁伴噺(MB)"
from lf.sys_dir a where id > 1 and pid = 0;
-select name "m1", (select sum(sizes) from lf.sys_meta b where b.dircode like a.code || '%') "sizes",
+select name "m1", coalesce((select sum(sizes) from lf.sys_meta b where b.dircode like a.code || '%'), 0) "sizes",
(select count(*) from lf.sys_meta b where b.dircode like a.code || '%') "count"
from lf.sys_dir a where pid = 0 order by a.code;
diff --git a/src/main/java/com/lf/server/entity/ctrl/PubEntity.java b/src/main/java/com/lf/server/entity/ctrl/PubEntity.java
index 7b1645c..061a66b 100644
--- a/src/main/java/com/lf/server/entity/ctrl/PubEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/PubEntity.java
@@ -30,9 +30,9 @@
private String depcode;
- private Integer isModel;
-
private List<String> ids;
+
+ private List<Integer> models;
public String getType() {
return type;
@@ -106,14 +106,6 @@
this.depcode = depcode;
}
- public Integer getIsModel() {
- return isModel;
- }
-
- public void setIsModel(Integer isModel) {
- this.isModel = isModel;
- }
-
public List<String> getIds() {
return ids;
}
@@ -121,4 +113,12 @@
public void setIds(List<String> ids) {
this.ids = ids;
}
+
+ public List<Integer> getModels() {
+ return models;
+ }
+
+ public void setModels(List<Integer> models) {
+ this.models = models;
+ }
}
diff --git a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
index f01b35f..4423c9b 100644
--- a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
@@ -42,6 +42,8 @@
private int rows;
+ private int records;
+
private String msg;
private Boolean isMeta;
@@ -176,6 +178,14 @@
this.rows = rows;
}
+ public int getRecords() {
+ return records;
+ }
+
+ public void setRecords(int records) {
+ this.records = records;
+ }
+
public String getMsg() {
return msg;
}
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 3a39ba3..9c6f776 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -235,6 +235,7 @@
if (null == list || list.isEmpty()) {
return;
}
+ mf.setRecords(list.size());
setCreateInfo(list, mf);
int rows = batchInserts(basicMapper, list);
@@ -490,8 +491,8 @@
MetaEntity me = createMeta(mf, metaId);
metaService.insert(me);
-
- mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+ String err = mf.getRows() < mf.getRecords() ? "(" + (mf.getRecords() - mf.getRows()) + " 鏉″け璐�)" : "";
+ mf.setMsg(me.getId() > 0 ? String.format("鎴愬姛%s", err) : "澶辫触");
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 90cf8c4..42a9db7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -70,7 +70,7 @@
## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
max-wait: 6000
# 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- time-between-eviction-runs-millis: 60000
+ time-between-eviction-runs-millis: 90000
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
min-evictable-idle-time-millis: 300000
max-pool-prepared-statement-per-connection-size: 50
--
Gitblit v1.9.3