求解

src/main/java/com/caesolver/server/SolverService.java

@@ -72,6 +72,7 @@ public class SolverService {
 		Integer i=0;
 		if(resourcesCode.equals(RabbitConfig.RESOURECODE)) { 
 			  //求解开始
+			changJobState(jobId, "0",null);
 			log.info("Solver start   id={}",projectId);
 			esSeverPut(projectId, "Solver start", i,startTime);
 			if(projectType.equals(FEM)) {
@@ -80,7 +81,7 @@ public class SolverService {
 				i=jobExec(runtime, jobOrder, projectId, startTime);
 			}
 			log.info("Solver changJobState start  id={}",projectId);
-			changJobState(jobId, startTime);
+			changJobState(jobId, "1","1");
 			log.info("Solver changJobState end  id={}",projectId);
 			//求解结束
 			esSeverPut(projectId, "Solver end", ++i,startTime);
@@ -91,6 +92,7 @@ public class SolverService {
     
     public void precessController( String jobId, String jobOrder, String projectType,String projectId,String orderType,Integer vfreq,Integer afreq) 
     		throws IOException, Exception {
+    	changJobState(jobId, "0","0");
     	Runtime runtime = Runtime.getRuntime();
     	String startTime =TimeUtils.getNow();
 		Integer i=0;
@@ -114,7 +116,7 @@ public class SolverService {
 		sftpUtil.uploadByProjectId(projectId,projectType);
 		log.info("Solver uploadByProjectId end  id={}",projectId);
 		log.info("Solver changJobState start  id={}",projectId);
-		changJobState(jobId, startTime);
+		changJobState(jobId, "1","1");
 		log.info("Solver changJobState end  id={}",projectId);
 		//求解结束
 		esSeverPut(projectId, "Solver end", ++i,startTime);
@@ -170,8 +172,6 @@ public class SolverService {
 	
 	
 	private void  esSeverPut(String projectId,String line, int id,String startTime) throws Exception {
-//		System.out.println(esurl);
-//		System.out.println(line);
 		Map<String, String> paramMap=new HashMap<>();
 		paramMap.put("projectId", projectId);
 		paramMap.put("log", line);
@@ -191,17 +191,16 @@ public class SolverService {
 	}
 	
 
-	private void changJobState(String jobId, String starTime) throws Exception {
+	private void changJobState(String jobId, String state ,String resultsState) throws Exception {
 		
 		Map<String, String> paramMap=new HashMap<>();
 		paramMap.put("channelNo", "service");
 		paramMap.put("clientToken", "e47b87eec69545559d1e81e56626da68");
-		paramMap.put("transCode", "A00111");
+		paramMap.put("transCode", "C00008");
 		paramMap.put("id", jobId);
-		paramMap.put("state", "1");
+		paramMap.put("state", state);
 		paramMap.put("userId","5f06c8bc77234f969d13e160b54c27e3");
-		paramMap.put("startexeTime", starTime);
-		paramMap.put("endexeTime", TimeUtils.getNow());
+		paramMap.put("resultsState", resultsState);
 		HttpUtils.doPost(url,"","",new HashMap<String, String>(),new HashMap<String, String>(),paramMap);
 	}
 	
@@ -222,34 +221,22 @@ public class SolverService {
 			Integer afreq, Integer vfreq, String resources) throws Exception {
 		Runtime runtime = Runtime.getRuntime();
     	String startTime =TimeUtils.getNow();
-		
+    	changJobState(jobId, "0","0");
     	Integer i=0;
-		log.info("Solver start   id={}",projectId);
 		esSeverPut(projectId, "Solver start", ++i,startTime);
-		log.info("Solver downLoadAll start id={}",projectId);
 		sftpUtil.downloadByProjectId(projectId,projectType);
-		log.info("Solver downLoadAll end  id={}",projectId);
-		log.info("Solver jobExec start  id={}",projectId);
 		jobOrder =createJobOrder(projectId,jobOrder, projectType,orderType,vfreq,afreq,resources);		
 		i=jobExec(runtime, jobOrder, projectId, startTime);	
-		
-		log.info("Solver jobExec end  id={}",projectId);
-		log.info("Solver uploadAll start  id={}",projectId);
 		//结果文件处理
 		copyOutFile(projectId, projectType, orderType);	
-		
 		sftpUtil.uploadByProjectId(projectId,projectType);
-		log.info("Solver uploadByProjectId end  id={}",projectId);
-		log.info("Solver changJobState start  id={}",projectId);
-		changJobState(jobId, startTime);
-		log.info("Solver changJobState end  id={}",projectId);
+		changJobState(jobId, "1","1");
 		//求解结束
 		esSeverPut(projectId, "Solver end", ++i,startTime);
-	    log.info("Solver end  id={}",projectId);
-	    String endTime =TimeUtils.getNow();
-	    if(projectType.equals(this.HCFD)){
-	    	this.consume(projectId, startTime, endTime,projectType);
-	    }
+//	    String endTime =TimeUtils.getNow();
+//	    if(projectType.equals(this.HCFD)){
+//	    	this.consume(projectId, startTime, endTime,projectType);
+//	    }
 		
 	}
 	/**