Compare commits

..

No commits in common. "c5feddefa992a58795cf87fea9ba43f7356076a6" and "cfc285bd0f8201b3b2d02eb85726678221af471b" have entirely different histories.

21 changed files with 68 additions and 188 deletions

View File

View File

@ -1,28 +0,0 @@
<component name="libraryTable">
<library name="lib">
<CLASSES>
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/ojdbc8.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-io-2.5.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-codec-1.10.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/poi-excelant-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/ojdbc8dms_g.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/junit-4.12.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/poi-ooxml-schemas-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/poi-scratchpad-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-collections4-4.1.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/ojdbc8dms.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-fileupload-1.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/poi-ooxml-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-logging-1.2.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/ifxjdbc.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/log4j-1.2.17.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-compress-1.12.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/ojdbc8_g.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-io-2.5-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/commons-compress-1.12-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/web/WEB-INF/lib/poi-3.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="lib1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.jms.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.resource.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.transaction.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.servlet.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.persistence.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.servlet.jsp.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.ejb.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.servlet.jsp.jstl.jar!/" />
<root url="jar://$PROJECT_DIR$/telsale_import/lib/javax.annotation.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jsp.iml" filepath="$PROJECT_DIR$/jsp.iml" />
</modules>
</component>
</project>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/telsale_import/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib1" level="project" />
<orderEntry type="library" name="lib" level="project" />
</component>
</module>

View File

@ -1,19 +1,13 @@
<component name="ArtifactManager"> <component name="ArtifactManager">
<artifact type="exploded-war" name="2018版电销转介绍管理系统:war exploded"> <artifact type="exploded-war" name="2018版电销管理系统:war exploded">
<output-path>$PROJECT_DIR$/../../../../../../../应用/电销管理/exploded</output-path> <output-path>$PROJECT_DIR$/out/artifacts/2018_war_exploded</output-path>
<root id="root"> <root id="root">
<element id="javaee-facet-resources" facet="2018版电销转介绍管理系统/web/Web" />
<element id="directory" name="WEB-INF"> <element id="directory" name="WEB-INF">
<element id="directory" name="classes"> <element id="directory" name="classes">
<element id="module-output" name="2018版电销转介绍管理系统" /> <element id="module-output" name="2018版电销转介绍管理系统" />
</element> </element>
<element id="directory" name="lib">
<element id="library" level="project" name="lib" />
<element id="library" level="project" name="poi-3.17" />
</element> </element>
</element>
<element id="library" level="project" name="annotations-api" />
<element id="library" level="project" name="jsp-api" />
<element id="javaee-facet-resources" facet="2018版电销转介绍管理系统/web/Web" />
</root> </root>
</artifact> </artifact>
</component> </component>

View File

@ -1,8 +0,0 @@
<component name="ArtifactManager">
<artifact type="war" name="telsale_management">
<output-path>$PROJECT_DIR$/../../../../../../../应用/电销管理/war</output-path>
<root id="archive" name="telsale_management.war">
<element id="artifact" artifact-name="2018版电销转介绍管理系统:war exploded" />
</root>
</artifact>
</component>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="dataSourceStorageLocal" created-in="IU-211.7628.21"> <component name="dataSourceStorageLocal" created-in="IU-211.7442.40">
<data-source name="@10.39.0.86" uuid="18e54f09-a43b-4c32-8386-8d030a8f8277"> <data-source name="@10.39.0.86" uuid="18e54f09-a43b-4c32-8386-8d030a8f8277">
<database-info product="Oracle" version="Oracle Database 11g Enterprise Edition Release 11.2.0.1.0 - 64bit Production&#10;With the Partitioning, OLAP, Data Mining and Real Application Testing options" jdbc-version="4.0" driver-name="Oracle JDBC driver" driver-version="12.1.0.2.0" dbms="ORACLE" exact-version="0.0"> <database-info product="Oracle" version="Oracle Database 11g Enterprise Edition Release 11.2.0.1.0 - 64bit Production&#10;With the Partitioning, OLAP, Data Mining and Real Application Testing options" jdbc-version="4.0" driver-name="Oracle JDBC driver" driver-version="12.1.0.2.0" dbms="ORACLE" exact-version="0.0">
<extra-name-characters>$#</extra-name-characters> <extra-name-characters>$#</extra-name-characters>

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" serverName="10.39.0.31" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="10.39.0.31">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
</component>
</project>

View File

@ -0,0 +1,27 @@
<component name="libraryTable">
<library name="commons-codec-1.10">
<CLASSES>
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-codec-1.10.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-collections4-4.1.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-compress-1.12.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-fileupload-1.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-io-2.5.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-logging-1.2.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/ifxjdbc.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/junit-4.12.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/log4j-1.2.17.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/ojdbc5.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/ojdbc6.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/poi-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/poi-excelant-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/poi-ooxml-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/poi-ooxml-schemas-3.15.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/poi-scratchpad-3.15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-compress-1.12-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/commons-io-2.5-javadoc.jar!/" />
</JAVADOC>
<SOURCES />
</library>
</component>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SshConfigs">
<configs>
<sshConfig authType="PASSWORD" host="10.39.0.31" id="1558ae0f-884d-474d-a30f-299e43b95667" port="22" nameFormat="DESCRIPTIVE" username="kane" />
</configs>
</component>
</project>

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WebServers">
<option name="servers">
<webServer id="9fc6d3eb-ed90-4e8d-af0c-cdf953dc25c9" name="10.39.0.31" url="http://10.39.0.31:8000">
<fileTransfer rootFolder="/tomcat/apache-tomcat-9.0.50/webapps" accessType="SFTP" host="10.39.0.31" port="22" sshConfigId="1558ae0f-884d-474d-a30f-299e43b95667" sshConfig="kane@10.39.0.31:22 password">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
</fileTransfer>
</webServer>
</option>
</component>
</project>

View File

@ -41,7 +41,7 @@ public class DataImport
int rowIndex = 0; int rowIndex = 0;
int rowCount = 0; int rowCount = 0;
int errorCount = 0; int errorCount = 0;
String errorMessage = "读取excel表格时发现错误,请修正后重新上传!<br>\n"; String errorMessage = "数据错误,请修正后重新上传!<br>\n";
try try
{ {
@ -116,12 +116,6 @@ public class DataImport
return policyList; return policyList;
} }
/**
* @Description: 读取单元格的数据以字符串形式返回值
* @Param: poi的单元格对象
* @return: java.lang.String 返回字符串形式的值
* @Author: 王炜
* @Date: 2021/6/27 **/
private static String getStringValueFromHSSFCell( HSSFCell cell ) private static String getStringValueFromHSSFCell( HSSFCell cell )
{ {
String value = null; String value = null;
@ -191,7 +185,7 @@ public class DataImport
CallableStatement callStmt = null; CallableStatement callStmt = null;
String callProcedureSql = "{call telsale_policy_check_pkg.save_policy(?,?,?,?,?,?,?,?,?,?,?,?,?)}"; String callProcedureSql = "{call telsale_policy_check_pkg.save_policy(?,?,?,?,?,?,?,?,?,?,?,?,?)}";
String errorMessage = "写入oracle数据库时发现错误,请按照提示修正后重新上传!<br>\n"; String errorMessage = "写入oracle数据库错误,请按照提示修正后重新上传!<br>\n";
//用来记录异常记录的数量 //用来记录异常记录的数量
int errorCount = 0; int errorCount = 0;
@ -287,7 +281,7 @@ public class DataImport
PreparedStatement statement = null; PreparedStatement statement = null;
int errorCount = 0; int errorCount = 0;
String errorMessage = "写入informix数据库时发现错误,请根据提示修正后重新上传!"; String errorMessage = "写入数据错误,请根据提示修正后重新上传!";
String insertSQL = String insertSQL =
"INSERT INTO dxbd_test \n" + "INSERT INTO dxbd_test \n" +
" (bdh,\n" + " (bdh,\n" +
@ -390,14 +384,13 @@ public class DataImport
try try
{ {
//关闭自动提交
oracleConnection.setAutoCommit( false ); oracleConnection.setAutoCommit( false );
informixConnection.setAutoCommit( false ); informixConnection.setAutoCommit( false );
saveTelsalePolicyDataToOracle( oracleConnection, policyList ); saveTelsalePolicyDataToOracle( oracleConnection, policyList );
saveTelsalePolicyDataToInformix( informixConnection, policyList ); saveTelsalePolicyDataToInformix( informixConnection, policyList );
//没问题就提交
oracleConnection.commit(); oracleConnection.commit();
informixConnection.commit(); informixConnection.commit();
} }

View File

@ -39,11 +39,9 @@ public class uploadDataProcessor extends HttpServlet
oracleUserName = (String) config.getServletContext().getInitParameter( "oracleUserName" ); oracleUserName = (String) config.getServletContext().getInitParameter( "oracleUserName" );
oraclePassword = (String) config.getServletContext().getInitParameter( "oraclePassword" ); oraclePassword = (String) config.getServletContext().getInitParameter( "oraclePassword" );
//informix //informix dxbd_test
//生产环境 //informixURL = (String) config.getServletContext().getInitParameter( "informixURL" );
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() telsalePolicyOperatorListTableName = (String) config.getServletContext()
.getInitParameter( "telsalePolicyOperatorListTableName" ); .getInitParameter( "telsalePolicyOperatorListTableName" );
} }

View File

@ -1,43 +1,53 @@
PL/SQL Developer Project Desktop PL/SQL Developer Project Desktop
[Desktop] [Desktop]
SavePath=D:\develop\projects_win\2018\telsale_management_2017\代码\oracle\项目\
Index=1 Index=1
Filename=D:\develop\projects_win\2018\telsale_management_2017\代码\oracle\项目\建表\查询.sql
Connection=244247965046494447145012484649683842385250145008442633163310327232823292
DPI=96
Left=0
Top=0
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 Filename=D:\develop\projects_win\2018\telsale_management_2017\덜쯤\oracle\淃커\관\telsale_policy_check_pkg.pck
VCSDBObject=0 VCSDBObject=0
Connection=216549034801466750134767469748193565357547374763498140633577401940294039 Connection=271145534323418944714289409142133087477745794477439133453099306130553049344348614855459331633157337533853395
DPI=96 DPI=96
Left=0 Left=0
Top=0 Top=0
Width=1275 Width=1550
Height=719 Height=719
State=0 State=0
Type=3 Type=3
ChildListIndex=1 ChildListIndex=1
Pinned=0 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 Index=3
Filename= Filename=D:\develop\projects_win\2018\telsale_management_2017\代码\oracle\项目\建表\查询.sql
Connection=257344154185430743334119420940753205321541214115455734473441314731573167 Connection=206849344704482648524670472845943724416649604602477237263992395439484070356842184212446240564050401240224032
DPI=96
Left=0
Top=0
Width=1550
Height=719
State=0
Type=1
ChildListIndex=2
Pinned=0
[Files] [Files]
[MRU] [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
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 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 1,D:\develop\projects_win\2018\telsale_management_2017\덜쯤\oracle\淃커\쉔깊\든饋괏데斤口쩌흙휑羚깊.sql