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;
@@ -109,7 +110,7 @@ public class DataModelController extends BaseController {
 	 * @param res
 	 * @param req
 	 * @return
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	@RequestMapping("/data.json")
 	@ResponseBody
@@ -159,11 +160,11 @@ public class DataModelController extends BaseController {
 		if (null != data && data.length > 0) {
 			List<String> list = new ArrayList<String>();
 			List<String> errList = new ArrayList<String>();
-			//判断是否有 不能删除的。
+			// 判断是否有 不能删除的。
 			for (String dataId : data) {
-				if(CacheSetCantDelete.containsId(dataId))
+				if (CacheSetCantDelete.containsId(dataId))
 					errList.add(dataId);
-				else 
+				else
 					list.add(dataId);
 			}
 			if (list.size() > 0) {
@@ -175,7 +176,7 @@ public class DataModelController extends BaseController {
 				mode.put("err", errList);
 				req.setStatus(500);
 			}
-			
+
 		}
 		return mode;
 	}
@@ -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
-						+ " status=0";
+				String cmd = "kubectl label --overwrite rc " + rcName + " 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;
 	}
 
@@ -292,7 +293,7 @@ public class DataModelController extends BaseController {
 			if (isConnect) {
 				req.setStatus(200);
 				if (null != form.getInneed() && form.getInneed().size() > 0) {
-					for (OracleConnectorParams oracleParams : form.getInneed()) {						
+					for (OracleConnectorParams oracleParams : form.getInneed()) {
 						BasedTask task = new OracleExtractTask(
 								oracleParams.getName(), form.getTarget(),
 								oracleParams, OracleExtract);
@@ -462,10 +463,10 @@ public class DataModelController extends BaseController {
 	public Object getExtractLog(@RequestParam("rcName") String name,
 			HttpServletRequest res, HttpServletResponse req) throws Exception {
 		log.info("---------/oracle/extract/log-------------------");
-		String result = logReadService.readLog(name);		
+		String result = logReadService.readLog(name);
 		// "查看相应日志"
 		Map<String, String> log = new HashMap<String, String>();
-		log.put(name, result+"\r\n");
+		log.put(name, result + "\r\n");
 		return log;
 	}
 }

src/com/platform/service/OracleStatusService.java

@@ -16,9 +16,11 @@ import com.platform.oracle.OracleConnector;
 import com.platform.utils.Configs;
 import com.platform.utils.Constant;
 
-/** 计时 尝试连接oracle的时间，（超过10分钟判断失败）
+/**
+ * 计时 尝试连接oracle的时间，（超过10分钟判断失败）
+ * 
  * @author chen
- *
+ * 
  */
 public class OracleStatusService {
 	private static Map<String, Timer> alliveTask = new Hashtable<String, Timer>();
@@ -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
-					+ " status=0";
+			String cmd = "kubectl label --overwrite rc " + replicasName + " 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
-						+ " status=1";
+				String cmd = "kubectl label --overwrite rc " + taskName + " 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 "
-									+ taskName + " status=2";
+							String cmd = "kubectl label --overwrite rc " + taskName
+									+ " status=2";
 							// client.updateOrAddReplicasLabelById(taskNSyame,
 							// "status", "2");
 							List<String> rList = Constant.ganymedSSH

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

@@ -76,9 +76,9 @@ public class CheckoutServiceImpl implements ICheckoutService {
 		List<CheckoutEntity> checks = new ArrayList<CheckoutEntity>();
 		List<PreDataInfo> result = preDataInfoDao.findAllCollect();
 		DataInfoEntity data = new DataInfoEntity();
-		 Calendar c2 = Calendar.getInstance();
+		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){
-		num -= Configs.dataBefore;
-		if (num <= 0) {
-			num = num + 12;
-		}
-		return num;
+	private int getMonBeforeHalfYear(Calendar c2){
+		c2.set(Calendar.DAY_OF_YEAR, c2.get(Calendar.DAY_OF_YEAR) -(Configs.dataBefore*30));
+		return 1;
 	}
 	
 	private String isY(String str1, String str2) {

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

@@ -63,6 +63,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");
 

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);