From 59e3bb0a0535869665a15dc929aa962fef60a3c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C?= Date: Wed, 1 Aug 2018 19:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.idea/dataSources.local.xml | 4 +- 代码/jsp/telsale_import/.idea/vcs.xml | 1 + .../cpic/telsale/DataImport/DataImport.java | 68 ++++++++++++------- .../uploadData/uploadDataProcessor.java | 12 ++-- 代码/jsp/telsale_import/web/WEB-INF/web.xml | 8 +++ 5 files changed, 62 insertions(+), 31 deletions(-) diff --git a/代码/jsp/telsale_import/.idea/dataSources.local.xml b/代码/jsp/telsale_import/.idea/dataSources.local.xml index 7393ef9..74e917e 100644 --- a/代码/jsp/telsale_import/.idea/dataSources.local.xml +++ b/代码/jsp/telsale_import/.idea/dataSources.local.xml @@ -2,7 +2,7 @@ - + $# " @@ -14,7 +14,7 @@ *:IDST0,PUBLIC - + $# " diff --git a/代码/jsp/telsale_import/.idea/vcs.xml b/代码/jsp/telsale_import/.idea/vcs.xml index 35eb1dd..8e48c4d 100644 --- a/代码/jsp/telsale_import/.idea/vcs.xml +++ b/代码/jsp/telsale_import/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java index 8a1a928..ac77f2e 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java @@ -160,6 +160,9 @@ public class DataImport ifxStmt.execute(); + //成功写入提示 + importResult = importResult + "第" + rowIndex + "行，保单号" + policyNo + "，转介绍信息入成功！
"; + successCount++; } catch( StaffCodeNotExistException error ) @@ -175,8 +178,18 @@ public class DataImport } catch( SQLException error ) { - //写入错误 - importResult = importResult + "第" + rowIndex + "行，保单号" + policyNo + ",数据库写入错误，错误信息：" + error.getMessage() + "。
"; + int errorCode = error.getErrorCode(); + + switch ( errorCode ) + { + case -268: //保单号重复 + importResult = importResult + "第" + rowIndex + "行，保单号" + policyNo + ",已录入过转介绍信息！" + error.getCause() + "。
"; + break; + + default: //写入错误 + importResult = importResult + "第" + rowIndex + "行，保单号" + policyNo + ",数据库写入错误，错误信息：" + error.getCause() + "。
"; + break; + } //标志位 isSuccess = false; @@ -195,6 +208,10 @@ public class DataImport //计数 failCount++; } + finally + { + ifxConn.commit(); + } } rowIndex++; @@ -202,15 +219,15 @@ public class DataImport } //判断标志位，如果为false，则说明在保存过程中出现了错误，放弃所有过程，进行回滚。 - if ( isSuccess == true ) - { - //oracleConn.commit(); - ifxConn.commit(); - } - else - { - ifxConn.rollback(); - } +// if ( isSuccess == true ) +// { +// //oracleConn.commit(); +// ifxConn.commit(); +// } +// else +// { +// ifxConn.rollback(); +// } //清理 xlsFile.close(); @@ -218,19 +235,19 @@ public class DataImport //日志 importMessage = "读取记录数量：" + (rowIndex - 1) + - "
正确记录数量：" + successCount + - "
错误记录数量：" + failCount; + "
写入记录数量：" + successCount + + "
错误记录数量：" + failCount + "
"; - if ( failCount != 0 ) - { - //有错误的记录，输出提示 - importMessage += "
请根据错误提示修正后重新导入！
"; - } - else - { - //无错误的记录，输出成功提示 - importMessage += "
文件已成功导入！
"; - } +// if ( failCount != 0 ) +// { +// //有错误的记录，输出提示 +// importMessage += "
请根据错误提示修正后重新导入！
"; +// } +// else +// { +// //无错误的记录，输出成功提示 +// importMessage += "
文件已成功导入！
"; +// } //追加导入记录 importMessage += importResult; @@ -242,6 +259,11 @@ public class DataImport { String value = null; + if ( cell == null ) + { + return ""; + } + switch ( cell.getCellType() ) { case HSSFCell.CELL_TYPE_NUMERIC: diff --git a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java index 108966c..adffedc 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java @@ -19,9 +19,9 @@ import com.cpic.telsale.DataImport.*; public class uploadDataProcessor extends HttpServlet { private String tempPathRoot; //临时文件目录 -// private String oracleURL; -// private String oracleUserName; -// private String oraclePassword; + private String oracleURL; + private String oracleUserName; + private String oraclePassword; private String informixURL; private String telsalePolicyOperatorListTableName; //informix库电销转介绍表名 @@ -29,9 +29,9 @@ public class uploadDataProcessor extends HttpServlet public void init( ServletConfig config ) throws ServletException { //获取参数 -// oracleURL = ( String )config.getServletContext().getInitParameter( "oracleURL" ); -// oracleUserName = ( String )config.getServletContext().getInitParameter( "oracleUserName" ); -// oraclePassword = ( String )config.getServletContext().getInitParameter( "oraclePassword" ); + oracleURL = ( String )config.getServletContext().getInitParameter( "oracleURL" ); + oracleUserName = ( String )config.getServletContext().getInitParameter( "oracleUserName" ); + oraclePassword = ( String )config.getServletContext().getInitParameter( "oraclePassword" ); //informix informixURL = ( String )config.getServletContext().getInitParameter( "informixURL" ); diff --git a/代码/jsp/telsale_import/web/WEB-INF/web.xml b/代码/jsp/telsale_import/web/WEB-INF/web.xml index e4869a1..02c1d46 100644 --- a/代码/jsp/telsale_import/web/WEB-INF/web.xml +++ b/代码/jsp/telsale_import/web/WEB-INF/web.xml @@ -35,6 +35,14 @@ informixURL jdbc:informix-sqli://10.187.11.163:9096/ywgl_xm:INFORMIXSERVER=pxmcx2;newcodeset=GBK,8859-1,819;user=ccx99;password=ct0IT17! + + ora_xmcx1_url + jdbc:oracle:thin:@10.39.0.86:1521:xmcx1;user=ywglxt;password=ywglxt"; + + + ora_jgy_url + jdbc:oracle:thin:@10.187.11.164:1521:xmcx1;user=ywglxt;password=ywglxt"; + telsalePolicyOperatorListTableName w_dxbd_i