求解

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

@@ -225,21 +225,21 @@ public class SolverService {
 		Runtime runtime = Runtime.getRuntime();
     	String startTime =TimeUtils.getNow();
     	changJobState(jobId, "0","0");
-//    	Integer i=0;
-//		esSeverPut(projectId, "Solver start", ++i,startTime);
-//		sftpUtil.downloadByProjectId(projectId,projectType);
-//		jobOrder =createJobOrder(projectId,jobOrder, projectType,orderType,vfreq,afreq,resources);		
-//		i=jobExec(runtime, jobOrder, projectId, startTime);	
-//		//结果文件处理
-//		copyOutFile(projectId, projectType, orderType);	
-//		sftpUtil.uploadByProjectId(projectId,projectType);
+    	Integer i=0;
+		esSeverPut(projectId, "Solver start", ++i,startTime);
+		sftpUtil.downloadByProjectId(projectId,projectType);
+		jobOrder =createJobOrder(projectId,jobOrder, projectType,orderType,vfreq,afreq,resources);		
+		i=jobExec(runtime, jobOrder, projectId, startTime);	
+		//结果文件处理
+		copyOutFile(projectId, projectType, orderType);	
+		sftpUtil.uploadByProjectId(projectId,projectType);
 		changJobState(jobId, "1","1");
 		//求解结束
-//		esSeverPut(projectId, "Solver end", ++i,startTime);
-//	    String endTime =TimeUtils.getNow();
-//	    if(projectType.equals(this.HCFD)){
-//	    	this.consume(projectId, startTime, endTime,projectType);
-//	    }
+		esSeverPut(projectId, "Solver end", ++i,startTime);
+	    String endTime =TimeUtils.getNow();
+	    if(projectType.equals(this.HCFD)){
+	    	this.consume(projectId, startTime, endTime,projectType);
+	    }
 		
 	}
 	/**