2017.2.7出差过程中伍铭+陈立文修改的代码。

src/com/platform/controller/DataModelController.java

@@ -42,6 +42,7 @@ import com.platform.service.IVolumeService;
 import com.platform.service.OracleExtractTask;
 import com.platform.service.OracleStatusService;
 import com.platform.utils.CacheSetCantDelete;
+import com.platform.utils.Configs;
 import com.platform.utils.Constant;
 import com.platform.utils.ThreadVolumeImm;
 import com.platform.utils.UtilsHelper;
@@ -196,8 +197,7 @@ public class DataModelController extends BaseController {
 		if (oraclesName != null)
 			for (String rcName : oraclesName) {
 				log.info("执行连接\t" + rcName);
-				String cmd = "kubectl label --overwrite rc " + rcName
+				String cmd = "kubectl label --overwrite rc " + rcName + " status=0";
-						+ " status=0";
 				List<String> rList = Constant.ganymedSSH
 						.execCmdWaitAcquiescent(cmd);
 				StringBuffer sb = new StringBuffer();
@@ -243,7 +243,8 @@ public class DataModelController extends BaseController {
 	public String volumeList() throws Exception {
 		log.info("-----/volume/list------");
 		String rest = volumeService.getAllvolume();
-		new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-volumeList").start();
+		new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-volumeList")
+				.start();
 		return rest;
 	}
 

src/com/platform/service/OracleStatusService.java

@@ -16,7 +16,9 @@ import com.platform.oracle.OracleConnector;
 import com.platform.utils.Configs;
 import com.platform.utils.Constant;
 
-/** 计时 尝试连接oracle的时间，（超过10分钟判断失败）
+/**
+ * 计时 尝试连接oracle的时间，（超过10分钟判断失败）
+ * 
  * @author chen
  * 
  */
@@ -41,8 +43,7 @@ public class OracleStatusService {
 
 	public void cancelToOracle(String replicasName, String operate) {
 		if (operate.equals("stop")) {
-			String cmd = "kubectl label --overwrite rc " + replicasName
+			String cmd = "kubectl label --overwrite rc " + replicasName + " status=0";
-					+ " status=0";
 			List<String> rList = Constant.ganymedSSH
 					.execCmdWaitAcquiescent(cmd);
 			StringBuffer sb = new StringBuffer();
@@ -120,8 +121,7 @@ public class OracleStatusService {
 				killAlliveTask(taskName);
 				// client.updateOrAddReplicasLabelById(taskName, "status", "1");
 				// //更新ReplicationController标签，将oracle状态标示未1(0:启动中，1：失败，2：成功)
-				String cmd = "kubectl label --overwrite rc " + taskName
+				String cmd = "kubectl label --overwrite rc " + taskName + " status=1";
-						+ " status=1";
 				List<String> rList = Constant.ganymedSSH
 						.execCmdWaitAcquiescent(cmd);
 				StringBuffer sb = new StringBuffer();
@@ -144,8 +144,8 @@ public class OracleStatusService {
 								+ ocp.getPassword());
 						String message = "失败";
 						if (flag && alliveTask.containsKey(taskName)) {
-							String cmd = "kubectl label --overwrite rc "
+							String cmd = "kubectl label --overwrite rc " + taskName
-									+ taskName + " status=2";
+									+ " status=2";
 							// client.updateOrAddReplicasLabelById(taskNSyame,
 							// "status", "2");
 							List<String> rList = Constant.ganymedSSH

src/com/platform/service/impl/CheckoutServiceImpl.java

@@ -78,7 +78,7 @@ public class CheckoutServiceImpl implements ICheckoutService {
 		DataInfoEntity data = new DataInfoEntity();
 		Calendar c2 = Calendar.getInstance();
 		 // 时间设置为 半年前的时间
-		 c2.set(Calendar.MONTH, getMonBeforeHalfYear(c2.get(Calendar.MONTH)));
+		this.getMonBeforeHalfYear(c2);
 		 String time = DateForm.date2StringByDay(c2.getTime());
 		 data.setCollectingTime(time);
 //		data.setCollectingTime(collectingTime);
@@ -124,7 +124,7 @@ public class CheckoutServiceImpl implements ICheckoutService {
 		CheckoutEntity cksql = new CheckoutEntity();
 		Calendar c2 = Calendar.getInstance();
 		 // 时间设置为 半年前的时间
-		c2.set(Calendar.MONTH, getMonBeforeHalfYear(c2.get(Calendar.MONTH)));
+		this.getMonBeforeHalfYear(c2);
 		String time = DateForm.date2StringByDay(c2.getTime());
 		cksql.setCollectingTime(time);
 		cksql.setCityName(city);
@@ -451,12 +451,9 @@ public class CheckoutServiceImpl implements ICheckoutService {
 	 * @param num
 	 * @return
 	 */
-	private int getMonBeforeHalfYear(int num){
+	private int getMonBeforeHalfYear(Calendar c2){
-		num -= Configs.dataBefore;
+		c2.set(Calendar.DAY_OF_YEAR, c2.get(Calendar.DAY_OF_YEAR) -(Configs.dataBefore*30));
-		if (num <= 0) {
+		return 1;
-			num = num + 12;
-		}
-		return num;
 	}
 	
 	private String isY(String str1, String str2) {

src/com/platform/service/impl/OracleExtractServiceImpl.java

@@ -87,8 +87,8 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 						dataInfoDao.updateExtract(data);
 						collectOracle.setName("J"
 								+ collectOracle.getName().replace("-", "_"));
-						String cmd = "kubectl label --overwrite rc "
+						String cmd = "kubectl label --overwrite rc " + replicasName
-								+ replicasName + " isExtract=1";
+								+ " isExtract=1";
 						// sql日志记录时间：
 						FileOperateHelper
 								.fileWrite(
@@ -127,7 +127,8 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 						Configs.CONSOLE_LOGGER.info(sb.toString());
 						data.setExtractStatus(2);
 						dataInfoDao.updateExtract(data);
-						DataInfoEntity tmpdata = dataInfoDao.findById(data.getId());
+						DataInfoEntity tmpdata = dataInfoDao.findById(data
+								.getId());
 						data.setId(tmpdata.getSrcId());
 						dataInfoDao.updateExtract(data);
 					}
@@ -141,28 +142,26 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 					data.setId(tmpdata.getSrcId());
 					dataInfoDao.updateExtract(data);
 					log.error(Custom4exception.OracleSQL_Except, e);
-				}
+				} finally {
-				finally{
 					// 去掉保存的当前数据id,
-					CacheSetCantDelete.removeExtractId(collectOracle.getDataId());
+					CacheSetCantDelete.removeExtractId(collectOracle
+							.getDataId());
 					String msg = "汇总结束";
 					if (2 != data.getExtractStatus()) {
 						msg += "  汇总有异常！状态重置为待汇总   ";
 						data.setExtractStatus(0);
 						dataInfoDao.updateExtract(data);
-						DataInfoEntity tmpdata = dataInfoDao.findById(data.getId());
+						DataInfoEntity tmpdata = dataInfoDao.findById(data
+								.getId());
 						data.setId(tmpdata.getSrcId());
 						dataInfoDao.updateExtract(data);
 					}
 					// sql日志记录时间：
-					FileOperateHelper
+					FileOperateHelper.fileWrite(
-							.fileWrite(
 							Configs.EXTRACT_LOG_LOCALTION
-											+ collectOracle.getName()
+									+ collectOracle.getName() + ".log",
-											+ ".log",
 							"\r\n " + msg + "  >>>>>>>    "
-											+ DateForm
+									+ DateForm.date2StringBysecond(new Date())
-													.date2StringBysecond(new Date())
 									+ "\r\n\r\n\n");
 				}
 			}
@@ -210,13 +209,12 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 		Connection conn = OracleConnector.connectionBuilder(
 				"jdbc:oracle:thin:@" + oracleModel.getIp() + ":"
 						+ oracleModel.getPort() + ":"
-							+ oracleModel.getDatabaseName(),
+						+ oracleModel.getDatabaseName(), oracleModel.getUser(),
-					oracleModel.getUser(), oracleModel.getPassword(),
+				oracleModel.getPassword(), dataInfolist.get(0));
-					dataInfolist.get(0));
 		if (null == conn) {
 			FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
-						+ dataInfolist.get(0).getName() + ".log",
+					+ dataInfolist.get(0).getName() + ".log", "创建oracle连接失败: ["
-						"创建oracle连接失败: [" + conn + "]\r\n");
+					+ conn + "]\r\n");
 			return false;
 		}
 		for (OracleConnectorParams collectOracle : datainfos) {
@@ -232,17 +230,14 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 					dataInfoDao.update(data);
 					collectOracle.setName("CQ"
 							+ collectOracle.getName().replace("-", "_"));
-						String cmd = "kubectl annotate --overwrite rc "
+					String cmd = "kubectl annotate --overwrite rc " + replicasName
-								+ replicasName + " standardExtractStatus=1";
+							+ " standardExtractStatus=1";
 					// sql日志记录时间：
-						FileOperateHelper
+					FileOperateHelper.fileWrite(
-								.fileWrite(
 							Configs.EXTRACT_STANDARD_LOG_LOCALTION
-												+ collectOracle.getName()
+									+ collectOracle.getName() + ".log",
-												+ ".log",
 							"\r\n 开始抽取标准表      \r\n   "
-												+ DateForm
+									+ DateForm.date2StringBysecond(new Date())
-														.date2StringBysecond(new Date())
 									+ "\n\r\n");
 					List<String> rList = Constant.ganymedSSH
 							.execCmdWaitAcquiescent(cmd);
@@ -258,13 +253,12 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 							oracleModel); // 创建表空间
 					oracleExtract.createOnlyUser(conn, collectOracle,
 							oracleModel);// 创建 抽取标准表的 用户并授权
-						DataInfoEntity tmpdata = dataInfoDao.findById(data
+					DataInfoEntity tmpdata = dataInfoDao.findById(data.getId());
-								.getId());
 					if (null != tmpdata) {
 						if (Constant.CHECKOUT_STATUS_THREE.equals(tmpdata
 								.getPayResultLast())
-									|| Constant.CHECKOUT_STATUS_FIVE
+								|| Constant.CHECKOUT_STATUS_FIVE.equals(tmpdata
-											.equals(tmpdata.getPayResultLast())) {
+										.getPayResultLast())) {
 							// 抽取中
 							data.setPayResultLast(Constant.CHECKOUT_STATUS_SIX);
 							dataInfoDao.update(data);
@@ -286,15 +280,15 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 						}
 						if (Constant.CHECKOUT_STATUS_THREE.equals(tmpdata
 								.getExecResultLast())
-									|| Constant.CHECKOUT_STATUS_FIVE
+								|| Constant.CHECKOUT_STATUS_FIVE.equals(tmpdata
-											.equals(tmpdata.getExecResultLast())) {
+										.getExecResultLast())) {
 							// 抽取中
 							data.setExecResultLast(Constant.CHECKOUT_STATUS_SIX);
 							dataInfoDao.update(data);
 							boolean isExtrac = true;
 							try {
-									oracleExtract.extractStandardExecTable(
+								oracleExtract.extractStandardExecTable(conn,
-											conn, collectOracle, oracleModel);// 执行抽取
+										collectOracle, oracleModel);// 执行抽取
 							} catch (Exception e) {
 								// 改回 校验存在的状态
 								data.setExecResultLast(Constant.CHECKOUT_STATUS_THREE);
@@ -309,10 +303,9 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 						// client.updateOrAddReplicasLabelById(collectOracle.getName(),
 						// "isExtract", "2");
 						// //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
-							cmd = "kubectl annotate --overwrite rc "
+						cmd = "kubectl annotate --overwrite rc " + replicasName
-									+ replicasName + " standardExtractStatus=2";
+								+ " standardExtractStatus=2";
-							rList = Constant.ganymedSSH
+						rList = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-									.execCmdWaitAcquiescent(cmd);
 						sb = new StringBuffer();
 						for (String string : rList)
 							sb.append(string).append("\n");
@@ -320,15 +313,16 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 						data.setCheckoutFlag(Constant.CHECKOUTFLAG_SEVEN);
 						data.setStandardExtractStatus("2");
 						dataInfoDao.update(data);
-							DataInfoEntity tmpSrcData = dataInfoDao.findById(data.getId());
+						DataInfoEntity tmpSrcData = dataInfoDao.findById(data
+								.getId());
 						data.setId(tmpSrcData.getSrcId());
 						dataInfoDao.update(data);
 					}
 				}
 			} catch (Exception e) {
 
-					String cmd = "kubectl annotate --overwrite rc "
+				String cmd = "kubectl annotate --overwrite rc " + replicasName
-							+ replicasName + " standardExtractStatus=0";
+						+ " standardExtractStatus=0";
 				Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
 				data.setStandardExtractStatus("0");
 				dataInfoDao.update(data);
@@ -336,8 +330,7 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 				data.setId(tmpSrcData.getSrcId());
 				dataInfoDao.update(data);
 				log.error(Custom4exception.OracleSQL_Except, e);
-				}
+			} finally {
-				finally{
 				// 去掉保存的当前数据id,
 				CacheSetCantDelete.removeStandardId(collectOracle.getDataId());
 				String msg = "抽取标准表结束";

src/com/platform/service/thread/ThreadCheckoutStandardOracle.java

@@ -20,13 +20,16 @@ import com.platform.utils.Configs;
 import com.platform.utils.Constant;
 import com.platform.utils.FileOperateHelper;
 
-/** 校验oracle标准表是否存在
+/**
+ * 校验oracle标准表是否存在
+ * 
  * @author chen
  * 
  */
 public class ThreadCheckoutStandardOracle extends Thread {
 
-	public final static Logger log = Configs.CONSOLE_LOGGER.getLogger(ThreadCheckoutStandardOracle.class);
+	public final static Logger log = Configs.CONSOLE_LOGGER
+			.getLogger(ThreadCheckoutStandardOracle.class);
 
 	/**
 	 * kuber 客户端
@@ -55,7 +58,8 @@ public class ThreadCheckoutStandardOracle extends Thread {
 		for (int i = 0; i < 11; i++) {
 			try {
 				// 数据的 keys （=kuber的应用名称 taskName)
-				Set<String> taskNames = CacheOracleCheckoutEntity.getCheckKeys();
+				Set<String> taskNames = CacheOracleCheckoutEntity
+						.getCheckKeys();
 				int lengs = taskNames.size();
 				if (lengs == 0) {
 					break;
@@ -71,7 +75,8 @@ public class ThreadCheckoutStandardOracle extends Thread {
 					// 获得 kuber的 pod
 					Pod tmpPod = filterPod(key);
 					if (null == tmpPod) {
-						log.info("replicationController标签：  " + key + " 的 pod 节点不存在！");
+						log.info("replicationController标签：  " + key
+								+ " 的 pod 节点不存在！");
 						if (i > 5) {
 							CacheOracleCheckoutEntity.checkRemove(key);
 						}
@@ -81,15 +86,14 @@ public class ThreadCheckoutStandardOracle extends Thread {
 					connectOracle(tmpPod, key);
 
 					if (i == 10) {
-						String cmd = "kubectl label --overwrite rc " + key
+						String cmd = "kubectl label --overwrite rc " + key + " status=1";
-								+ " status=1";
 						List<String> rList = Constant.ganymedSSH
 								.execCmdWaitAcquiescent(cmd);
 						StringBuffer sb = new StringBuffer();
 						for (String str : rList)
 							sb.append(str).append("\n");
-						log.info("更新replicationController标签： "
+						log.info("更新replicationController标签： " + key
-								+ key + "\t[标签更新为： 失败]");
+								+ "\t[标签更新为： 失败]");
 						log.info(sb.toString());
 
 						String cmd2 = "kubectl annotate --overwrite rc " + key
@@ -99,11 +103,12 @@ public class ThreadCheckoutStandardOracle extends Thread {
 						StringBuffer sb2 = new StringBuffer();
 						for (String str : rList2)
 							sb2.append(str).append("\n");
-						log.info("更新replicationController标签： "
+						log.info("更新replicationController标签： " + key
-								+ key + "\t[标签更新为： 未校验]");
+								+ "\t[标签更新为： 未校验]");
 						log.info(sb2.toString());
 						// 当前key标签对应的 数据服务的记录
-						CheckoutEntity tmp = CacheOracleCheckoutEntity.getCheck(key);
+						CheckoutEntity tmp = CacheOracleCheckoutEntity
+								.getCheck(key);
 						tmp.setCheckoutFlag(Constant.CHECKOUTFLAG_ZERO);
 						tmp.setPayResultLast(Constant.CHECKOUT_STATUS_ZERO);
 						tmp.setExecResultLast(Constant.CHECKOUT_STATUS_ZERO);
@@ -117,8 +122,7 @@ public class ThreadCheckoutStandardOracle extends Thread {
 				}
 			} catch (Exception e1) {
 				log.error(e1.getStackTrace());
-			}
+			} finally {
-			finally{
 				try {
 					Thread.sleep(1000 * 60);
 				} catch (InterruptedException e) {
@@ -128,7 +132,9 @@ public class ThreadCheckoutStandardOracle extends Thread {
 		}
 	}
 
-	/** 查找 pod 节点
+	/**
+	 * 查找 pod 节点
+	 * 
 	 * @param taskName
 	 * @return
 	 */
@@ -146,7 +152,9 @@ public class ThreadCheckoutStandardOracle extends Thread {
 		return pod;
 	}
 
-	/** 尝试连接 oracle服务
+	/**
+	 * 尝试连接 oracle服务
+	 * 
 	 * @param tmpPod
 	 * @param key
 	 */
@@ -155,29 +163,25 @@ public class ThreadCheckoutStandardOracle extends Thread {
 			String ip = client.getPodHostIp(pod);
 			int port = client.getPodContainerport(pod);
 			if (ip != null && port != 0) {
-				String url = "jdbc:oracle:thin:@" + ip + ":" + port
+				String url = "jdbc:oracle:thin:@" + ip + ":" + port + ":"
-						+ ":" + Configs.ORACLE_ORCL;
+						+ Configs.ORACLE_ORCL;
 				boolean flag = OracleConnector.canConnect(url, // 连接结果返回参数，true标示连接成功，false标示连接失败
 						Configs.ORACLE_USER, Configs.ORACLE_PSW);
-				log.info("url:" + url + ",user:"
+				log.info("url:" + url + ",user:" + Configs.ORACLE_USER
-						+ Configs.ORACLE_USER + ",password:"
+						+ ",password:" + Configs.ORACLE_PSW);
-						+ Configs.ORACLE_PSW);
 				String message = "失败";
 
-				String cmd3 = "kubectl annotate --overwrite rc "
+				String cmd3 = "kubectl annotate --overwrite rc " + key + " checkoutFlag=0";
-						+ key + " checkoutFlag=0";
 				List<String> rList3 = Constant.ganymedSSH
 						.execCmdWaitAcquiescent(cmd3);
 				StringBuffer sb3 = new StringBuffer();
 				for (String str : rList3)
 					sb3.append(str).append("\n");
 				log.info(sb3.toString());
-				log.info("更新replicationController标签： "
+				log.info("更新replicationController标签： " + key + "\t[标签更新为：未校验]");
-						+ key + "\t[标签更新为：未校验]");
 
 				if (flag) {
-					String cmd = "kubectl label --overwrite rc "
+					String cmd = "kubectl label --overwrite rc " + key + " status=2";
-							+ key + " status=2";
 					// 设置服务为 成功
 					List<String> rList = Constant.ganymedSSH
 							.execCmdWaitAcquiescent(cmd);
@@ -186,48 +190,71 @@ public class ThreadCheckoutStandardOracle extends Thread {
 						sb.append(str).append("\n");
 					log.info(sb.toString());
 					message = "成功";
-					log.info("更新replicationController标签： "
+					log.info("更新replicationController标签： " + key
-									+ key + "\t[标签更新为： 成功]");
+							+ "\t[标签更新为： 成功]");
 					// 校验标签
-					String cmd2 = "kubectl annotate --overwrite rc "
+					String cmd2 = "kubectl annotate --overwrite rc " + key
-							+ key + " checkoutFlag=2";
+							+ " checkoutFlag=2";
 					List<String> rList2 = Constant.ganymedSSH
 							.execCmdWaitAcquiescent(cmd2);
 					StringBuffer sb2 = new StringBuffer();
 					for (String str : rList2)
 						sb2.append(str).append("\n");
 					log.info(sb2.toString());
-					log.info("更新replicationController标签： "
+					log.info("更新replicationController标签： " + key
-							+ key + "\t[标签更新为： 校验中]");
+							+ "\t[标签更新为： 校验中]");
 					// 获得当前 服务对应的 数据
-					CheckoutEntity tmp = CacheOracleCheckoutEntity.getCheck(key);
+					CheckoutEntity tmp = CacheOracleCheckoutEntity
+							.getCheck(key);
 					if (null != tmp) {
 						CacheOracleCheckoutEntity.putExtract(key, tmp);
 					}
 					// 查询 对应的 2 个标准表
 					OracleConnectorParams oc = new OracleConnectorParams();
-					String logName = tmp.getAreaCode().toLowerCase()+"_"+tmp.getSysCode()+"_"+tmp.getDataVersion();
+					String logName = tmp.getAreaCode().toLowerCase() + "_"
+							+ tmp.getSysCode() + "_" + tmp.getDataVersion();
 					oc.setName(logName);
 					try {
-						Connection conn = OracleConnector.connectionBuilder(url, Configs.ORACLE_USER, Configs.ORACLE_PSW, oc);
+						Connection conn = OracleConnector.connectionBuilder(
+								url, Configs.ORACLE_USER, Configs.ORACLE_PSW,
+								oc);
 						// 支付--校验
-						if (!Constant.CHECKOUT_STATUS_ONE.equals(tmp.getPayResultLast())) {
+						if (!Constant.CHECKOUT_STATUS_ONE.equals(tmp
-							String paySql = "select * from dba_tables where owner = '"+Configs.COLLECT_STANDARD_TABLE_USER.toUpperCase()
+								.getPayResultLast())) {
-									+ "' and table_name = '"+Configs.COLLECT_PAY_TABLE.toUpperCase() +"'";
+							String paySql = "select * from dba_tables where owner = '"
-							if(OracleConnector.execUpdateOracleSQL(conn, paySql, 
+									+ Configs.COLLECT_STANDARD_TABLE_USER
-									FileOperateHelper.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)+ logName +"jy.log")){
+											.toUpperCase()
+									+ "' and table_name = '"
+									+ Configs.COLLECT_PAY_TABLE.toUpperCase()
+									+ "'";
+							if (OracleConnector
+									.execUpdateOracleSQL(
+											conn,
+											paySql,
+											FileOperateHelper
+													.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)
+													+ logName + "jy.log")) {
 								tmp.setPayResultLast(Constant.CHECKOUT_STATUS_THREE);
-							}
+							} else {
-							else {
 								tmp.setPayResultLast(Constant.CHECKOUT_STATUS_FOUR);
 							}
 						}
 						// 可执行-- 校验
-						if (!Constant.CHECKOUT_STATUS_ONE.equals(tmp.getExecResultLast())) {
+						if (!Constant.CHECKOUT_STATUS_ONE.equals(tmp
-							String execSql = "select * from dba_tables where owner = '"+Configs.COLLECT_STANDARD_TABLE_USER.toUpperCase()
+								.getExecResultLast())) {
-									+ "' and table_name = '"+Configs.COLLECT_EXEC_TABLE.toUpperCase() +"'";
+							String execSql = "select * from dba_tables where owner = '"
-							if(OracleConnector.execUpdateOracleSQL(conn, execSql, 
+									+ Configs.COLLECT_STANDARD_TABLE_USER
-									FileOperateHelper.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)+ logName +"jy.log")){
+											.toUpperCase()
+									+ "' and table_name = '"
+									+ Configs.COLLECT_EXEC_TABLE.toUpperCase()
+									+ "'";
+							if (OracleConnector
+									.execUpdateOracleSQL(
+											conn,
+											execSql,
+											FileOperateHelper
+													.addLastSeparator(Configs.EXTRACT_STANDARD_LOG_LOCALTION)
+													+ logName + "jy.log")) {
 								tmp.setExecResultLast(Constant.CHECKOUT_STATUS_THREE);
 							} else {
 								tmp.setExecResultLast(Constant.CHECKOUT_STATUS_FOUR);
@@ -236,11 +263,13 @@ public class ThreadCheckoutStandardOracle extends Thread {
 						tmp.setCheckoutFlag(Constant.CHECKOUTFLAG_ONE);
 						// 更新数据库data_info
 						updateDataInfo(tmp);
-						// 将 CacheOracleCheckoutEntity checkMap中的 数据 放入extractMap中
+						// 将 CacheOracleCheckoutEntity checkMap中的 数据
-						/*CacheOracleCheckoutEntity.putExtract(key, */CacheOracleCheckoutEntity.checkRemove(key)/*)*/;
+						// 放入extractMap中
+						/* CacheOracleCheckoutEntity.putExtract(key, */CacheOracleCheckoutEntity
+								.checkRemove(key)/* ) */;
 						// 更新kuber状态
-						cmd2 = "kubectl annotate --overwrite rc "
+						cmd2 = "kubectl annotate --overwrite rc " + key
-								+ key + " checkoutFlag=1";
+								+ " checkoutFlag=1";
 						// client.updateOrAddReplicasLabelById(taskNSyame,
 						// "status", "2");
 						rList = Constant.ganymedSSH
@@ -250,22 +279,23 @@ public class ThreadCheckoutStandardOracle extends Thread {
 							sb.append(str).append("\n");
 						log.info(sb.toString());
 						message = "成功";
-						log.info("更新replicationController标签： "
+						log.info("更新replicationController标签： " + key
-										+ key + "\t[标签更新为： 已校验]");
+								+ "\t[标签更新为： 已校验]");
 					} catch (Exception e) {
 						log.error(e);
 					}
 					// 成功 就 清除 CacheOracleCheckoutEntity 中 的该条记录
 					CacheOracleCheckoutEntity.checkRemove(key);
 				}
-				log.info("连接到数据库服务： " + key
+				log.info("连接到数据库服务： " + key + "\t[连接结果： " + message + "]");
-						+ "\t[连接结果： " + message + "]");
 			}
 
 		}
 	}
 
-	/** 更新 dataInfo表
+	/**
+	 * 更新 dataInfo表
+	 * 
 	 * @param checkoutEntity
 	 * @throws Exception
 	 */
@@ -277,7 +307,8 @@ public class ThreadCheckoutStandardOracle extends Thread {
 		data.setExecResultLast(checkoutEntity.getExecResultLast());
 		data.setCheckoutFlag(checkoutEntity.getCheckoutFlag());
 		dataInfoDao.update(data);
-		DataInfoEntity tmpdata = dataInfoDao.findById(checkoutEntity.getDataId());
+		DataInfoEntity tmpdata = dataInfoDao.findById(checkoutEntity
+				.getDataId());
 		data.setId(tmpdata.getSrcId());
 		dataInfoDao.update(data);
 	}

src/com/platform/utils/Configs.java

@@ -27,6 +27,7 @@ public class Configs {
 
 	public static String KUBE_MASTER_URL = "http://192.168.0.110:8080/"; // kubernetes集群的maser
 																			// URl
+	public static String KUBE_MASTER_IP="127.0.0.1:8080"; //
 
 	public static int ORACLE_DEFAULT_PORT = 1521; // oracle的默认端口号
 

src/com/platform/utils/ConfigsLoader.java

@@ -64,6 +64,8 @@ public class ConfigsLoader implements ServletContextListener {
 		Configs.GATHER_SERVICE_NAME = properties
 				.getProperty("gather-service-name");
 		
+		Configs.KUBE_MASTER_IP= properties.getProperty("kuberMasterIp");
+
 		Configs.TABLE_SUFFIX = properties.getProperty("table-suffix");
 
 		Configs.EXTRACT_LOG_LOCALTION = properties

src/com/platform/utils/GanymedSSH.java

@@ -114,6 +114,9 @@ public class GanymedSSH {
 		Session sess = null;
 		try {
 //			conn = getOpenedConnection(host, username, password, port);
+			if (null != conn) {
+//				conn=getOpenedConnection(Configs., username, password, port)
+			}
 			sess = conn.openSession();
 			// 执锟斤拷cmd
 			sess.execCommand(cmd);