Merge branch 'web_backend_develope' of

https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope

Conflicts:
	src/com/base/BaseController.java
	src/com/platform/controller/DataModelController.java
	src/com/platform/service/impl/MoveDataServiceImpl.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java
	src/com/platform/utils/Constant.java

.classpath

@@ -2,13 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

src/com/base/BaseController.java

@@ -44,7 +44,7 @@ public class BaseController {
     public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) {  
         System.out.println("URI"+request.getRequestURI());
         request.setAttribute("ex", ex);  
-        System.err.println("BaseController --exp ");
+        System.err.println("BaseController --exp " + ex);
         // 根据不同错误转向不同页面  
         if(ex instanceof CustomException) {
         	CustomException cuse = (CustomException) ex;

src/com/platform/controller/DataModelController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.base.BaseController;
@@ -329,4 +330,15 @@ public class DataModelController extends BaseController{
 		Map<String, Object> result = codeService.findAll();
 		return result;
 	}
+	
+	@RequestMapping(value = "/oracle/extract/log", method= RequestMethod.POST )
+	@ResponseBody
+	public Object getExtractLog(@RequestParam("rcName") String name, HttpServletRequest res, HttpServletResponse req){
+		log.info("---------/oracle/extract/log-------------------");
+		StringBuilder sb = new StringBuilder();
+		sb.append("查看相应日志").append("\n").append("看到了");
+		Map<String, String> log = new HashMap<>();
+		log.put(name, sb.toString());
+		return log;
+	}
 }

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

@@ -7,9 +7,9 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.platform.entities.DataInfoEntity;
 import com.platform.entities.GatherOracleInfo;
 import com.platform.entities.OracleConnectorParams;
+import com.platform.kubernetes.SimpleKubeClient;
 import com.platform.oracle.OracleConnector;
 import com.platform.service.IOracleExtractService;
 import com.platform.service.OracleExtractHelper;
@@ -17,7 +17,10 @@ import com.platform.utils.Bean2MapUtils;
 
 @Service(value = "OracleExtract")
 public class OracleExtractServiceImpl implements IOracleExtractService {
-	
+	/**
+	 * kubernetes client
+	 */
+	private SimpleKubeClient client = new SimpleKubeClient();
 	/**
 	 * 抽取
 	 */
@@ -45,13 +48,13 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 			
 			Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + "/"
 					+ oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword());			
-			
 			for (OracleConnectorParams collectOracle : datainfos) {	
-				
+				client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "1"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
-				oracleExtract.createDBLink(conn, collectOracle);
+				oracleExtract.createDBLink(conn, collectOracle); //创建dblink
-				oracleExtract.createTableSpace(conn, oracleModel);
+				oracleExtract.createTableSpace(conn, oracleModel); //创建表空间
-				oracleExtract.createUser(conn, oracleModel);
+				oracleExtract.createUser(conn, oracleModel);//创建用户并授权
-				oracleExtract.extractColleDB(conn, collectOracle);
+				oracleExtract.extractColleDB(conn, collectOracle);//执行抽取
+				client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "2"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
 			}
 			isSuccess = true;
 		}catch(Exception e){