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/service/data/UploadService.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

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..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,13 +228,14 @@
 
         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;
         }
+        mf.setRecords(list.size());
         setCreateInfo(list, mf);
 
         int rows = batchInserts(basicMapper, list);
@@ -248,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);
@@ -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) : "澶辫触");
         }
     }
 

--
Gitblit v1.9.3