From acb296613cbfa22993c0cf59d55f533c7e030ce8 Mon Sep 17 00:00:00 2001
From: "Zhenfei.Li" <Zhenfei.Li@fanruan.com>
Date: Mon, 27 Jul 2020 23:19:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E6=8E=A8=E6=96=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c7c2d593246c0e1e0e262a527bdb3387efed992d)
---
 .../java/com/fr/plugin/decision/core/DML.java | 33 +++++++++++--------
 .../decision/core/action/CreateAction.java    |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/fr/plugin/decision/core/DML.java b/src/main/java/com/fr/plugin/decision/core/DML.java
index 453a5f7..a0ee370 100644
--- a/src/main/java/com/fr/plugin/decision/core/DML.java
+++ b/src/main/java/com/fr/plugin/decision/core/DML.java
@@ -122,8 +122,8 @@ public class DML {
             return execInsertedPreparedStatementByItem(dialect, conn, table, ps, rowCount, tableColName, tableColType, tableValue);
         }
 
-        for (int rownum=0; rownum<rowCount; rownum++) {
-            for (int index=0; index<tableColName.size(); index++) {
+        for (int rownum = 0; rownum < rowCount; rownum++) {
+            for (int index = 0; index < tableColName.size(); index++) {
                 int type = tableColType.get(index);
                 Object value = tableValue.get(tableColName.get(index)).get(rownum);
                 // excel 中读数 1 会识别为 1.0 , 列格式为[文本]时需要调整下
@@ -131,21 +131,26 @@ public class DML {
                     value = value.toString().split("\\.")[0];
                 }
 
-                DBUtils.applyColumnTypeValue(
-                        dialect,
-                        conn,
-                        table,
-                        null,
-                        null,
-                        ps,
-                        index + 1,
-                        type,
-                        value
-                );
+                try {
+                    DBUtils.applyColumnTypeValue(
+                            dialect,
+                            conn,
+                            table,
+                            null,
+                            null,
+                            ps,
+                            index + 1,
+                            type,
+                            value
+                    );
+                } catch (Exception e) {
+                    // 类型推断后，若遇到不符合该类型的值，直接catch错误
+                    FineLoggerFactory.getLogger().warn("type is not match");
+                }
             }
             count ++ ;
             ps.addBatch();
-            if(rownum!=0 && rownum%10000==0){
+            if(rownum != 0 && rownum % 10000 == 0){
                 ps.executeBatch();
                 ps.clearBatch();
             }
diff --git a/src/main/java/com/fr/plugin/decision/core/action/CreateAction.java b/src/main/java/com/fr/plugin/decision/core/action/CreateAction.java
index 361cbd2..7fe6443 100644
--- a/src/main/java/com/fr/plugin/decision/core/action/CreateAction.java
+++ b/src/main/java/com/fr/plugin/decision/core/action/CreateAction.java
@@ -56,7 +56,7 @@ public class CreateAction extends ExcelDmlAction {
                 FineLoggerFactory.getLogger().error("HW_excel导入:dropTable failed !", e.getMessage());
             }
             e.printStackTrace();
-            result.put("status", "failed").put("errorText", "【" + excelDmlBean.getTable().getName() + "】" + "新增操作异常" + e.getLocalizedMessage());
+            result.put("status", "failed").put("errorText", "【" + excelDmlBean.getTable().getName() + "】" + "导入数据库异常：" + e.getLocalizedMessage());
         } finally {
             DBUtils.close(conn);
             DBUtils.close(preparedStatement);