From 17a5e688ec420e93c6c036e15e0dbf430b5fd9cc Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Fri, 2 Jul 2021 18:12:06 +0800 Subject: [PATCH 1/3] ... --- 代码/jsp/telsale_import/.idea/dataSources.local.xml | 2 +- .../src/com/cpic/telsale/DataImport/DataImport.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/代码/jsp/telsale_import/.idea/dataSources.local.xml b/代码/jsp/telsale_import/.idea/dataSources.local.xml index 461437c..df1c21e 100644 --- a/代码/jsp/telsale_import/.idea/dataSources.local.xml +++ b/代码/jsp/telsale_import/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + $# 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 fdf3f0d..372add0 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java @@ -348,8 +348,8 @@ public class DataImport /** * @Description: 读取excel文件，将数据写入oracle和informix数据库。 - * 数据库连接关闭自动提交，在两个数据库都写入成功后提交。 - * 只要有一个数据库写入抛出异常，回滚两个数据库的事务。 + * 数据库连接关闭自动提交，在两个数据库都写入成功后提交。 + * 只要有一个数据库写入抛出异常，回滚两个数据库的事务。 * @Param: * @return: void * @Author: 王炜 @@ -384,13 +384,14 @@ public class DataImport try { - + //关闭自动提交 oracleConnection.setAutoCommit( false ); informixConnection.setAutoCommit( false ); saveTelsalePolicyDataToOracle( oracleConnection, policyList ); saveTelsalePolicyDataToInformix( informixConnection, policyList ); + //没问题就提交 oracleConnection.commit(); informixConnection.commit(); } From 90064a8ea8a346bfe30f91a1ff3bdb991ae1813f Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Tue, 6 Jul 2021 18:03:46 +0800 Subject: [PATCH 2/3] ... --- .../.idea/artifacts/2018_war_exploded.xml | 12 +++- .../.idea/artifacts/telsale_management.xml | 8 +++ .../jsp/telsale_import/.idea/deployment.xml | 14 +++++ .../.idea/libraries/commons_codec_1_10.xml | 27 --------- .../jsp/telsale_import/.idea/sshConfigs.xml | 8 +++ .../jsp/telsale_import/.idea/webServers.xml | 14 +++++ .../cpic/telsale/DataImport/DataImport.java | 6 +- .../uploadData/uploadDataProcessor.java | 6 +- .../项目/电销保单信息管理.dsk | 52 +++++++----------- ...空行，有保单号错误 - 副本.xls | Bin 26112 -> 29696 bytes 数据/测试数据/经办人错误.xls | Bin 26624 -> 30208 bytes 11 files changed, 81 insertions(+), 66 deletions(-) create mode 100644 代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml create mode 100644 代码/jsp/telsale_import/.idea/deployment.xml delete mode 100644 代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml create mode 100644 代码/jsp/telsale_import/.idea/sshConfigs.xml create mode 100644 代码/jsp/telsale_import/.idea/webServers.xml diff --git a/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml b/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml index 08aff9c..399b4fb 100644 --- a/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml +++ b/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml @@ -1,13 +1,19 @@ - - $PROJECT_DIR$/out/artifacts/2018_war_exploded + + $PROJECT_DIR$/../../../../../../../应用/电销管理/exploded - + + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml b/代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml new file mode 100644 index 0000000..8b33b4c --- /dev/null +++ b/代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/../../../../../../../应用/电销管理/war + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/deployment.xml b/代码/jsp/telsale_import/.idea/deployment.xml new file mode 100644 index 0000000..029090e --- /dev/null +++ b/代码/jsp/telsale_import/.idea/deployment.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml b/代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml deleted file mode 100644 index 378c683..0000000 --- a/代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/sshConfigs.xml b/代码/jsp/telsale_import/.idea/sshConfigs.xml new file mode 100644 index 0000000..59cbed2 --- /dev/null +++ b/代码/jsp/telsale_import/.idea/sshConfigs.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/webServers.xml b/代码/jsp/telsale_import/.idea/webServers.xml new file mode 100644 index 0000000..436badd --- /dev/null +++ b/代码/jsp/telsale_import/.idea/webServers.xml @@ -0,0 +1,14 @@ + + + + + + \ 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 372add0..6108236 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java @@ -41,7 +41,7 @@ public class DataImport int rowIndex = 0; int rowCount = 0; int errorCount = 0; - String errorMessage = "数据错误，请修正后重新上传！
\n"; + String errorMessage = "读取excel表格时发现错误，请修正后重新上传！
\n"; try { @@ -185,7 +185,7 @@ public class DataImport CallableStatement callStmt = null; String callProcedureSql = "{call telsale_policy_check_pkg.save_policy(?,?,?,?,?,?,?,?,?,?,?,?,?)}"; - String errorMessage = "写入oracle数据库错误，请按照提示修正后重新上传！
\n"; + String errorMessage = "写入oracle数据库时发现错误，请按照提示修正后重新上传！
\n"; //用来记录异常记录的数量 int errorCount = 0; @@ -281,7 +281,7 @@ public class DataImport PreparedStatement statement = null; int errorCount = 0; - String errorMessage = "写入数据错误，请根据提示修正后重新上传！"; + String errorMessage = "写入informix数据库时发现错误，请根据提示修正后重新上传！"; String insertSQL = "INSERT INTO dxbd_test \n" + " (bdh,\n" + 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 4c31fe0..fc6f722 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,10 @@ public class uploadDataProcessor extends HttpServlet oracleUserName = (String) config.getServletContext().getInitParameter( "oracleUserName" ); oraclePassword = (String) config.getServletContext().getInitParameter( "oraclePassword" ); - //informix dxbd_test - //informixURL = (String) config.getServletContext().getInitParameter( "informixURL" ); + //informix + //生产环境 + //informixURL = (String) config.getServletContext().getInitParameter( "informix_prod_url" ); + //测试环境 informixURL = (String) config.getServletContext().getInitParameter( "informix_url_92" ); telsalePolicyOperatorListTableName = (String) config.getServletContext() .getInitParameter( "telsalePolicyOperatorListTableName" ); diff --git a/代码/oracle/项目/电销保单信息管理.dsk b/代码/oracle/项目/电销保单信息管理.dsk index f5f6222..9c125ac 100644 --- a/代码/oracle/项目/电销保单信息管理.dsk +++ b/代码/oracle/项目/电销保单信息管理.dsk @@ -1,53 +1,43 @@ PL/SQL Developer Project Desktop [Desktop] -SavePath=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\ Index=1 -Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\telsale_policy_check_pkg.pck -VCSDBObject=0 -Connection=271145534323418944714289409142133087477745794477439133453099306130553049344348614855459331633157337533853395 -DPI=96 -Left=0 -Top=0 -Width=1550 -Height=719 -State=0 -Type=3 -ChildListIndex=1 -Pinned=0 - -Index=2 -Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\Ϣ.sql -Connection=228750254923504546234889507549414071444946675045492738813667372537513777391545654559423337633757384738573867 -DPI=96 -Left=0 -Top=0 -Width=1474 -Height=636 -State=0 -Type=1 -ChildListIndex=3 -Pinned=0 - -Index=3 Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\ѯ.sql -Connection=206849344704482648524670472845943724416649604602477237263992395439484070356842184212446240564050401240224032 +Connection=244247965046494447145012484649683842385250145008442633163310327232823292 DPI=96 Left=0 Top=0 -Width=1550 +Width=1275 Height=719 State=0 Type=1 ChildListIndex=2 Pinned=0 +Index=2 +Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\telsale_policy_check_pkg.pck +VCSDBObject=0 +Connection=216549034801466750134767469748193565357547374763498140633577401940294039 +DPI=96 +Left=0 +Top=0 +Width=1275 +Height=719 +State=0 +Type=3 +ChildListIndex=1 +Pinned=0 + +Index=3 +Filename= +Connection=257344154185430743334119420940753205321541214115455734473441314731573167 + [Files] [MRU] -1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\ѯ.sql 1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\Ϣ.sql +1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\ѯ.sql 3,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\telsale_policy_check_pkg.pck 1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\Ϣ¼־.sql diff --git a/数据/测试数据/有空行，有保单号错误 - 副本.xls b/数据/测试数据/有空行，有保单号错误 - 副本.xls index 1bcbc3c287cd60ac6e22136f1153da41ffd6e529..90b845137c4f10934e45ba2a499e0ff12fbb6642 100644 GIT binary patch delta 1874 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 gvQ0USudrrGl;F&U7AMue0h4k~C;$Ke delta 1086 zcmZuwT}V_x6#nKqyY7#>*X!QhyDP<3Y*h5)x*5{HrpwZg8nsD;4;7jenxZ{K1o;p} z^w7_ddWlH$p|>@zkUd$^Q$a-pK}b{tQ3z!eRz%yGyBY?b;mrAF&Y3gcId^W~gy?%F zhNTv$1n?)H&r7x`GPImMt|i2!{qru%4tKI8m3r4sJ@Sn9wAub8Gj7jzjdxy(A{uC{ zw)^}EjS_l<%7alF3`8gyET?sPlr**vgC>mzqI8RW&jM9c!f_{pNqWWWgRI+FzXqfB z5q(4oFI@;(F)x$&o-YMP7$}hy3*Nwlm&WGwE}!gVccVR$~hHobJ#)VYGs zk-2(MxXVj%YcB7m=^iv$H^~<*bElEb9{yo3ivBFMcPzVRXyf_=Mf_wE=ny~^zm0?jOt2kiJCp+Yi-4BZzz%*drhT#Y zx8Ik`08d^cTbxPHp*<_I2@NMaRMV=d1LRr09f{aW;(9bGt%1*qc>vJxrBljQYI z=K}#kYQ^JN>e3erFcI<1Wyn?sJ?2?J&A=Y)MjE>q%@WEr)_R#Nm?#8&$(m^fLwum2 zKHI1qF4o7ahym|a-7KSipxY|oaSqt40%yseJS~*vHPsycinVmf|9Zm*Jm9)VSyymp zYM9=0KCa$_ic~{cdtjeOZapa#H{c1oXWyeat1|8uz=<4D)vCXuby`*3%-fL|-EXp7 zDwl^Qvmr`K>FMq5ZR_qhE$zU8WRVcGsr5Y1k6PCh)pIwrwob?P6s-NOt-07Qon{J1 lNV~4{qZWJ1m)y>@8v*|F6u)b5=kGRUwJAH@eOL_k$iHMj+VB7X From 3b66aa691acc2f7520b6054dce4a650681195742 Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Tue, 13 Jul 2021 10:17:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E6=88=90=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/cpic/telsale/uploadData/uploadDataProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fc6f722..d865274 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java @@ -41,9 +41,9 @@ public class uploadDataProcessor extends HttpServlet //informix //生产环境 - //informixURL = (String) config.getServletContext().getInitParameter( "informix_prod_url" ); + informixURL = (String) config.getServletContext().getInitParameter( "informix_prod_url" ); //测试环境 - informixURL = (String) config.getServletContext().getInitParameter( "informix_url_92" ); + //informixURL = (String) config.getServletContext().getInitParameter( "informix_url_92" ); telsalePolicyOperatorListTableName = (String) config.getServletContext() .getInitParameter( "telsalePolicyOperatorListTableName" ); }