From 9556c4940a8428ac5a282a232ed0778fb92a3bff Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 18 Oct 2016 15:34:57 +0800
Subject: [PATCH] =?UTF-8?q?oracle=E6=8A=BD=E5=8F=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/platform/service/OracleExtractHelper.java           | 4 ++--
 src/com/platform/service/impl/OracleExtractServiceImpl.java | 2 +-
 src/com/platform/service/thread/ThreadMoveData.java         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java
index 7698d07f..6082873e 100644
--- a/src/com/platform/service/OracleExtractHelper.java
+++ b/src/com/platform/service/OracleExtractHelper.java
@@ -151,8 +151,8 @@ public class OracleExtractHelper {
 	 * @param conn 汇总库连接
 	 * @param oc 采集库
 	 */
-	public void extractColleDB(Connection conn, OracleConnectorParams oc) {
-		String strTUser = oc.getName() + Configs.TABLE_SUFFIX;
+	public void extractColleDB(Connection conn, OracleConnectorParams oc, GatherOracleInfo totalOracle) {
+		String strTUser = oc.getName() + totalOracle.getSuffix();
 		String sql = "SELECT 'create table "
 				+ strTUser
 				+ ".J'|| substr(t.OWNER||'_'||t.TABLE_NAME,0,29)||' as select * from '||t.OWNER||'.'||t.TABLE_NAME||"
diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java
index 2449f6a1..8b83f442 100644
--- a/src/com/platform/service/impl/OracleExtractServiceImpl.java
+++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java
@@ -80,7 +80,7 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 					oracleExtract.createDBLink(conn, collectOracle); //创建dblink
 					oracleExtract.createTableSpace(conn, collectOracle, oracleModel); //创建表空间
 					oracleExtract.createUser(conn, collectOracle, oracleModel);//创建用户并授权
-					oracleExtract.extractColleDB(conn, collectOracle);//执行抽取
+					oracleExtract.extractColleDB(conn, collectOracle, oracleModel);//执行抽取
 	//				client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "2"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
 					cmd = "kubectl label --overwrite rc "
 							+ replicasName + " isExtract=2";
diff --git a/src/com/platform/service/thread/ThreadMoveData.java b/src/com/platform/service/thread/ThreadMoveData.java
index 39407903..9a0e580c 100644
--- a/src/com/platform/service/thread/ThreadMoveData.java
+++ b/src/com/platform/service/thread/ThreadMoveData.java
@@ -121,14 +121,14 @@ public class ThreadMoveData{
 							realRate = (dstSize*100 / srcSize );
 							dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
 						}
-						if (srcSize == dstSize) {
+						if (srcSize == dstSize || realRate > 100) {
 							realRate = 100;
 						}
 						dataMove.setRate((int) realRate);
 					}
 					if("1".equals(dataMove.getCompleteStatus()) && dataMove.getRate() > 0){
 						//传输完毕：进行校验
-						if (realRate == 100) {
+						if (realRate >= 100) {
 							int difSize = (int) (srcSizeTemp-dstSize);
 							Thread.sleep(10*difSize);
 							//TODO 查看当前拷贝目录进程是否结束？