|  | @@ -155,7 +155,11 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 | 
											
												
													
														|  |  		SurromdaoFileListener t= new SurromdaoFileListener(pid);
 |  |  		SurromdaoFileListener t= new SurromdaoFileListener(pid);
 | 
											
												
													
														|  |  		surrMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0", t);
 |  |  		surrMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0", t);
 | 
											
												
													
														|  |  		surrMonitor.start();
 |  |  		surrMonitor.start();
 | 
											
												
													
														|  | -//
 |  | 
 | 
											
												
													
														|  | 
 |  | +		FileMonitor crmMonitor = new FileMonitor(1000);
 | 
											
												
													
														|  | 
 |  | +		CRMFileListener crml = new CRMFileListener(pid);
 | 
											
												
													
														|  | 
 |  | +		crmMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0/ADflow/results/aerodynamic", crml);
 | 
											
												
													
														|  | 
 |  | +		crmMonitor.start();
 | 
											
												
													
														|  | 
 |  | +		//
 | 
											
												
													
														|  |  //		FileMonitor aifoilMonitor = new FileMonitor(1000);
 |  |  //		FileMonitor aifoilMonitor = new FileMonitor(1000);
 | 
											
												
													
														|  |  //		AirfoilFileListener airfoilFileListener= new AirfoilFileListener(pid);
 |  |  //		AirfoilFileListener airfoilFileListener= new AirfoilFileListener(pid);
 | 
											
												
													
														|  |  //		aifoilMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0/xfoil", airfoilFileListener);
 |  |  //		aifoilMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0/xfoil", airfoilFileListener);
 | 
											
										
											
												
													
														|  | @@ -175,30 +179,30 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 | 
											
												
													
														|  |  			DockerExe.getDockerLogs(pid,new ResultCallback.Adapter<Frame>() {
 |  |  			DockerExe.getDockerLogs(pid,new ResultCallback.Adapter<Frame>() {
 | 
											
												
													
														|  |  				@Override
 |  |  				@Override
 | 
											
												
													
														|  |  				public void onNext(Frame frame) {
 |  |  				public void onNext(Frame frame) {
 | 
											
												
													
														|  | -					if(con[0] <100){
 |  | 
 | 
											
												
													
														|  | -						line[0]+=new String(frame.getPayload());
 |  | 
 | 
											
												
													
														|  | -						con[0]++;
 |  | 
 | 
											
												
													
														|  | -					}else{
 |  | 
 | 
											
												
													
														|  | -						LogService.addLog(pid, line[0]);
 |  | 
 | 
											
												
													
														|  | -						line[0]="";
 |  | 
 | 
											
												
													
														|  | -						con[0] =0;
 |  | 
 | 
											
												
													
														|  | -					}
 |  | 
 | 
											
												
													
														|  | -					LogService.addLog(pid, new String(frame.getPayload()));
 |  | 
 | 
											
												
													
														|  | -					System.out.print(new String(frame.getPayload()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +//					if(con[0] <100){
 | 
											
												
													
														|  | 
 |  | +//						line[0]+=new String(frame.getPayload());
 | 
											
												
													
														|  | 
 |  | +//						con[0]++;
 | 
											
												
													
														|  | 
 |  | +//					}else{
 | 
											
												
													
														|  | 
 |  | +////						LogService.addLog(pid, line[0]);
 | 
											
												
													
														|  | 
 |  | +//						line[0]="";
 | 
											
												
													
														|  | 
 |  | +//						con[0] =0;
 | 
											
												
													
														|  | 
 |  | +//					}
 | 
											
												
													
														|  | 
 |  | +//					LogService.addLog(pid, new String(frame.getPayload()));
 | 
											
												
													
														|  | 
 |  | +//					System.out.print(new String(frame.getPayload()));
 | 
											
												
													
														|  |  					super.onNext(frame);
 |  |  					super.onNext(frame);
 | 
											
												
													
														|  |  				}
 |  |  				}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  				@Override
 |  |  				@Override
 | 
											
												
													
														|  |  				public void onError(Throwable throwable) {
 |  |  				public void onError(Throwable throwable) {
 | 
											
												
													
														|  |  					System.err.println("日志获取失败");
 |  |  					System.err.println("日志获取失败");
 | 
											
												
													
														|  | -					LogService.addLog(pid, line[0]);
 |  | 
 | 
											
												
													
														|  | 
 |  | +//					LogService.addLog(pid, line[0]);
 | 
											
												
													
														|  |  					throwable.printStackTrace();
 |  |  					throwable.printStackTrace();
 | 
											
												
													
														|  |  					super.onError(throwable);
 |  |  					super.onError(throwable);
 | 
											
												
													
														|  |  				}
 |  |  				}
 | 
											
												
													
														|  |  				@Override
 |  |  				@Override
 | 
											
												
													
														|  |  				public void onComplete() {
 |  |  				public void onComplete() {
 | 
											
												
													
														|  |  					System.out.println("日志获取完成");
 |  |  					System.out.println("日志获取完成");
 | 
											
												
													
														|  | -					LogService.addLog(pid, line[0]);
 |  | 
 | 
											
												
													
														|  | 
 |  | +//					LogService.addLog(pid, line[0]);
 | 
											
												
													
														|  |  					super.onComplete();
 |  |  					super.onComplete();
 | 
											
												
													
														|  |  				}
 |  |  				}
 | 
											
												
													
														|  |  			});
 |  |  			});
 | 
											
										
											
												
													
														|  | @@ -212,6 +216,8 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 | 
											
												
													
														|  |  			try {
 |  |  			try {
 | 
											
												
													
														|  |  				surrMonitor.stop();
 |  |  				surrMonitor.stop();
 | 
											
												
													
														|  |  				SurromdaoFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/surromdao_history_all.dat"),pid);
 |  |  				SurromdaoFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/surromdao_history_all.dat"),pid);
 | 
											
												
													
														|  | 
 |  | +				crmMonitor.stop();
 | 
											
												
													
														|  | 
 |  | +				CRMFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/ADflow/results/aerodynamic/CRM_final_000_slices.dat"),pid);
 | 
											
												
													
														|  |  //				aifoilMonitor.stop();
 |  |  //				aifoilMonitor.stop();
 | 
											
												
													
														|  |  //				AirfoilFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/xfoil/airfoil.dat"),pid);
 |  |  //				AirfoilFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/xfoil/airfoil.dat"),pid);
 | 
											
												
													
														|  |  //				cpMonitor.stop();
 |  |  //				cpMonitor.stop();
 |