From 4878541b652e2aeb61528eca8b8e77fe3bc65607 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Thu, 24 Jun 2021 18:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99=E5=86=99=E5=85=A5informix?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=87=BD=E6=95=B0=E3=80=82?=
 =?UTF-8?q?=20=E5=9C=A8informix=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=B5=8B=E8=AF=95=E8=A1=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cpic/telsale/DataImport/DataImport.java   | 24 +++++++++----------
 .../uploadData/uploadDataProcessor.java       |  5 ++--
 代码/jsp/telsale_import/web/WEB-INF/web.xml |  4 ++++
 3 files changed, 19 insertions(+), 14 deletions(-)

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 2567aab..8b212de 100644
--- a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java
+++ b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java
@@ -624,12 +624,12 @@ public class DataImport
 
         try
         {
-            saveTelsalePolicyDataToOracle( oracleConnection, policyList );
-            //saveTelsalePolicyDataToInformix( informixConnection, policyList );
+            //saveTelsalePolicyDataToOracle( oracleConnection, policyList );
+            saveTelsalePolicyDataToInformix( informixConnection, policyList );
         }
-        catch ( TelsalePolicyDataSaveToOracleException error )
+        catch ( Exception error )
         {
-            //写入oracle错误，回滚两个数据库，再抛出异常
+            //出现任何错误，回滚两个数据库，再抛出异常
             oracleConnection.rollback();
             informixConnection.rollback();
 
@@ -643,14 +643,14 @@ public class DataImport
 //
 //            throw new TelsalePolicyDataSaveToDatabaseException( error.getMessage() );
 //        }
-        catch (SQLException error )
-        {
-            //任何其他sql错误，回滚两个数据库，再抛出异常
-            oracleConnection.rollback();
-            informixConnection.rollback();
-
-            throw error;
-        }
+//        catch (SQLException error )
+//        {
+//            //任何其他sql错误，回滚两个数据库，再抛出异常
+//            oracleConnection.rollback();
+//            informixConnection.rollback();
+//
+//            throw error;
+//        }
         finally
         {
             //无论如何要关闭连接
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 d1b0488..5467c0a 100644
--- a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java
+++ b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java
@@ -39,8 +39,9 @@ public class uploadDataProcessor extends HttpServlet
         oracleUserName = (String) config.getServletContext().getInitParameter( "oracleUserName" );
         oraclePassword = (String) config.getServletContext().getInitParameter( "oraclePassword" );
 
-        //informix
-        informixURL                        = (String) config.getServletContext().getInitParameter( "informixURL" );
+        //informix dxbd_test
+        //informixURL                        = (String) config.getServletContext().getInitParameter( "informixURL" );
+        informixURL                        = (String) config.getServletContext().getInitParameter( "dxbd_test" );
         telsalePolicyOperatorListTableName = (String) config.getServletContext()
                                                             .getInitParameter( "telsalePolicyOperatorListTableName" );
     }
diff --git a/代码/jsp/telsale_import/web/WEB-INF/web.xml b/代码/jsp/telsale_import/web/WEB-INF/web.xml
index f717196..f08013c 100644
--- a/代码/jsp/telsale_import/web/WEB-INF/web.xml
+++ b/代码/jsp/telsale_import/web/WEB-INF/web.xml
@@ -35,6 +35,10 @@
         <param-name>informixURL</param-name>
         <param-value>jdbc:informix-sqli://10.187.11.163:9096/ywgl_xm:INFORMIXSERVER=pxmcx2;newcodeset=GBK,8859-1,819;user=ccx99;password=ct0IT17!</param-value>
     </context-param>
+    <context-param>
+        <param-name>dxbd_test</param-name>
+        <param-value>jdbc:informix-sqli://10.39.0.92:9096/ywgl_xm:INFORMIXSERVER=pxmcx2;newcodeset=GBK,8859-1,819;user=ccx99;password=ct0IT17!</param-value>
+    </context-param>
     <context-param>
         <param-name>ora_telsale_url</param-name>
         <param-value>jdbc:oracle:thin:@10.39.0.85:1521:dev01;user=telsale;password=Cpic%231234;</param-value>