From e58679d4a709150cfe3d1058b38830094a600dc1 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Sun, 19 Feb 2017 11:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=ADconnection=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E8=A1=8Csql=20=3D=20br.readLine();?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ThreadExtractStandardSqlServer.java       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/com/platform/service/thread/ThreadExtractStandardSqlServer.java b/src/com/platform/service/thread/ThreadExtractStandardSqlServer.java
index 7c88d3cf..f3dbd792 100644
--- a/src/com/platform/service/thread/ThreadExtractStandardSqlServer.java
+++ b/src/com/platform/service/thread/ThreadExtractStandardSqlServer.java
@@ -93,15 +93,16 @@ public class ThreadExtractStandardSqlServer extends Thread{
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
+				 Connection payConn = null;
 				try {
 					File paySql = new File(payFilePath);
 					//获取连接
-					Connection conn = OracleConnector.connectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + ":"
+					payConn = OracleConnector.connectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + ":"
 							+ oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword(), null);
 					// 创建表空间    创建  抽取标准表的 用户并授权
-					oracleExtract.createTableSpace(conn, collectOracle , oracleConnect); //
-					oracleExtract.createOnlyUser(conn, collectOracle, oracleConnect);//
-					createPay(conn, collectOracle);
+					oracleExtract.createTableSpace(payConn, collectOracle , oracleConnect); //
+					oracleExtract.createOnlyUser(payConn, collectOracle, oracleConnect);//
+					createPay(payConn, collectOracle);
 				
 					//读取文件流
 					FileInputStream fis = new FileInputStream(paySql);
@@ -109,9 +110,8 @@ public class ThreadExtractStandardSqlServer extends Thread{
 					String sql = br.readLine();
 					while (sql != null) {
 						//TODO 执行sql
-						sql = br.readLine();
 						String resultSql = sql.replace(";", "");
-						OracleConnector.execOracleSQL(conn, resultSql, FileOperateHelper.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)
+						OracleConnector.execOracleSQL(payConn, resultSql, FileOperateHelper.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)
 								+ "CQ"+element.getAreaCode()+"_"+element.getSysCode()+"_"+element.getDataVersion()+".log");
 						sql = br.readLine();
 					}
@@ -138,6 +138,14 @@ public class ThreadExtractStandardSqlServer extends Thread{
 				} catch (CustomException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
+				} 
+				finally{
+					try {
+						payConn.close();
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 				}
 			}
 			 // 查询最新的 数据记录
@@ -171,7 +179,6 @@ public class ThreadExtractStandardSqlServer extends Thread{
 					while (sql != null) {
 						//TODO 执行sql
 						//TODO 执行sql
-						sql = br.readLine();
 						String resultSql = sql.replace(";", "");
 						OracleConnector.execOracleSQL(conn, resultSql, FileOperateHelper.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)
 								+ "CQ"+element.getAreaCode()+"_"+element.getSysCode()+"_"+element.getDataVersion()+".log");