提交小修改!
This commit is contained in:
		@@ -1,13 +1,19 @@
 | 
			
		||||
<component name="ArtifactManager">
 | 
			
		||||
  <artifact type="exploded-war" name="2018版电销管理系统:war exploded">
 | 
			
		||||
    <output-path>$PROJECT_DIR$/out/artifacts/2018_war_exploded</output-path>
 | 
			
		||||
  <artifact type="exploded-war" name="2018版电销转介绍管理系统:war exploded">
 | 
			
		||||
    <output-path>$PROJECT_DIR$/../../../../../../../应用/电销管理/exploded</output-path>
 | 
			
		||||
    <root id="root">
 | 
			
		||||
      <element id="javaee-facet-resources" facet="2018版电销转介绍管理系统/web/Web" />
 | 
			
		||||
      <element id="directory" name="WEB-INF">
 | 
			
		||||
        <element id="directory" name="classes">
 | 
			
		||||
          <element id="module-output" name="2018版电销转介绍管理系统" />
 | 
			
		||||
        </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 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>
 | 
			
		||||
  </artifact>
 | 
			
		||||
</component>
 | 
			
		||||
							
								
								
									
										8
									
								
								代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@@ -0,0 +1,8 @@
 | 
			
		||||
<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>
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<project version="4">
 | 
			
		||||
  <component name="dataSourceStorageLocal" created-in="IU-212.4746.92">
 | 
			
		||||
  <component name="dataSourceStorageLocal" created-in="IU-211.7628.21">
 | 
			
		||||
    <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
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>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										14
									
								
								代码/jsp/telsale_import/.idea/deployment.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								代码/jsp/telsale_import/.idea/deployment.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
			
		||||
<?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>
 | 
			
		||||
@@ -1,27 +0,0 @@
 | 
			
		||||
<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>
 | 
			
		||||
							
								
								
									
										8
									
								
								代码/jsp/telsale_import/.idea/sshConfigs.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								代码/jsp/telsale_import/.idea/sshConfigs.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@@ -0,0 +1,8 @@
 | 
			
		||||
<?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>
 | 
			
		||||
							
								
								
									
										14
									
								
								代码/jsp/telsale_import/.idea/webServers.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								代码/jsp/telsale_import/.idea/webServers.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
			
		||||
<?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>
 | 
			
		||||
@@ -41,7 +41,7 @@ public class DataImport
 | 
			
		||||
        int    rowIndex     = 0;
 | 
			
		||||
        int    rowCount     = 0;
 | 
			
		||||
        int    errorCount   = 0;
 | 
			
		||||
        String errorMessage = "数据错误,请修正后重新上传!<br>\n";
 | 
			
		||||
        String errorMessage = "读取excel表格时发现错误,请修正后重新上传!<br>\n";
 | 
			
		||||
 | 
			
		||||
        try
 | 
			
		||||
        {
 | 
			
		||||
@@ -191,7 +191,7 @@ public class DataImport
 | 
			
		||||
        CallableStatement callStmt = null;
 | 
			
		||||
 | 
			
		||||
        String callProcedureSql = "{call telsale_policy_check_pkg.save_policy(?,?,?,?,?,?,?,?,?,?,?,?,?)}";
 | 
			
		||||
        String errorMessage     = "写入oracle数据库错误,请按照提示修正后重新上传!<br>\n";
 | 
			
		||||
        String errorMessage     = "写入oracle数据库时发现错误,请按照提示修正后重新上传!<br>\n";
 | 
			
		||||
 | 
			
		||||
        //用来记录异常记录的数量
 | 
			
		||||
        int errorCount = 0;
 | 
			
		||||
@@ -287,7 +287,7 @@ public class DataImport
 | 
			
		||||
        PreparedStatement statement = null;
 | 
			
		||||
 | 
			
		||||
        int    errorCount   = 0;
 | 
			
		||||
        String errorMessage = "写入数据错误,请根据提示修正后重新上传!";
 | 
			
		||||
        String errorMessage = "写入informix数据库时发现错误,请根据提示修正后重新上传!";
 | 
			
		||||
        String insertSQL =
 | 
			
		||||
                "INSERT INTO dxbd_test \n" +
 | 
			
		||||
                        "    (bdh,\n" +
 | 
			
		||||
@@ -354,8 +354,8 @@ public class DataImport
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @Description: 读取excel文件,将数据写入oracle和informix数据库。
 | 
			
		||||
     * 数据库连接关闭自动提交,在两个数据库都写入成功后提交。
 | 
			
		||||
     * 只要有一个数据库写入抛出异常,回滚两个数据库的事务。
 | 
			
		||||
     *               数据库连接关闭自动提交,在两个数据库都写入成功后提交。
 | 
			
		||||
     *               只要有一个数据库写入抛出异常,回滚两个数据库的事务。
 | 
			
		||||
     * @Param:
 | 
			
		||||
     * @return: void
 | 
			
		||||
     * @Author: 王炜
 | 
			
		||||
@@ -390,13 +390,14 @@ public class DataImport
 | 
			
		||||
 | 
			
		||||
        try
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
            //关闭自动提交
 | 
			
		||||
            oracleConnection.setAutoCommit( false );
 | 
			
		||||
            informixConnection.setAutoCommit( false );
 | 
			
		||||
 | 
			
		||||
            saveTelsalePolicyDataToOracle( oracleConnection, policyList );
 | 
			
		||||
            saveTelsalePolicyDataToInformix( informixConnection, policyList );
 | 
			
		||||
 | 
			
		||||
            //没问题就提交
 | 
			
		||||
            oracleConnection.commit();
 | 
			
		||||
            informixConnection.commit();
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -39,9 +39,11 @@ 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" );
 | 
			
		||||
        informixURL                        = (String) config.getServletContext().getInitParameter( "informix_url_92" );
 | 
			
		||||
        //informix
 | 
			
		||||
        //生产环境
 | 
			
		||||
        informixURL                        = (String) config.getServletContext().getInitParameter( "informix_prod_url" );
 | 
			
		||||
        //测试环境
 | 
			
		||||
        //informixURL                        = (String) config.getServletContext().getInitParameter( "informix_url_92" );
 | 
			
		||||
        telsalePolicyOperatorListTableName = (String) config.getServletContext()
 | 
			
		||||
                                                            .getInitParameter( "telsalePolicyOperatorListTableName" );
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,53 +1,43 @@
 | 
			
		||||
PL/SQL Developer Project Desktop
 | 
			
		||||
 | 
			
		||||
[Desktop]
 | 
			
		||||
SavePath=D:\develop\projects_win\2018\telsale_management_2017\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\
 | 
			
		||||
 | 
			
		||||
Index=1
 | 
			
		||||
Filename=D:\develop\projects_win\2018\telsale_management_2017\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><>\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\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2>.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\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><><EFBFBD><EFBFBD>\<5C><>ѯ.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\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><>\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\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><><EFBFBD><EFBFBD>\<5C><>ѯ.sql
 | 
			
		||||
1,D:\develop\projects_win\2018\telsale_management_2017\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2>.sql
 | 
			
		||||
1,D:\develop\projects_win\2018\telsale_management_2017\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><><EFBFBD><EFBFBD>\<5C><>ѯ.sql
 | 
			
		||||
3,D:\develop\projects_win\2018\telsale_management_2017\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><>\telsale_policy_check_pkg.pck
 | 
			
		||||
1,D:\develop\projects_win\2018\telsale_management_2017\<5C><><EFBFBD><EFBFBD>\oracle\<5C><>Ŀ\<5C><><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ¼<CFA2><C2BC><EFBFBD><EFBFBD>־<EFBFBD><D6BE>.sql
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user