|
|
@@ -17,10 +17,7 @@ import com.miniframe.core.exception.BusinessException;
|
|
|
import com.miniframe.core.ext.UtilTools;
|
|
|
import com.miniframe.generate.business.mdo.model.MDO0039BaseModel;
|
|
|
import com.miniframe.mdo.service.LogService;
|
|
|
-import com.miniframe.model.mdo.MdoProComval;
|
|
|
-import com.miniframe.model.mdo.MdoProPython;
|
|
|
-import com.miniframe.model.mdo.MdoProPythonSQLBuilder;
|
|
|
-import com.miniframe.model.mdo.MdoProject;
|
|
|
+import com.miniframe.model.mdo.*;
|
|
|
import com.miniframe.model.mdo.dao.MdoProComvalMapper;
|
|
|
import com.miniframe.model.mdo.dao.MdoProPythonMapper;
|
|
|
import com.miniframe.model.mdo.dao.MdoProjectMapper;
|
|
|
@@ -70,6 +67,12 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
|
|
|
//异步执行
|
|
|
@SneakyThrows
|
|
|
public void run(String pid ,String stype)throws Exception{
|
|
|
+ MdoProComvalMapper comvalDao =UtilTools.getBean(MdoProComvalMapper.class);
|
|
|
+ MdoProComvalSQLBuilder sb =new MdoProComvalSQLBuilder();
|
|
|
+ MdoProComvalSQLBuilder.Criteria sc = sb.createCriteria();
|
|
|
+ sc.andPidEqualTo(pid);
|
|
|
+ comvalDao.deleteByExample(sb);
|
|
|
+
|
|
|
LogService.addLog(pid,"求解——————————————————开始");
|
|
|
DockerExe.stopDocker(pid);
|
|
|
DockerExe.runMdo(pid);
|
|
|
@@ -77,7 +80,6 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
|
|
|
final List<String>[] vals = new List[]{new ArrayList<>()};
|
|
|
final boolean[] flag = {true};//步数是否结束
|
|
|
final int[] valNSiz = {0};
|
|
|
- MdoProComvalMapper comvalDao =UtilTools.getBean(MdoProComvalMapper.class);
|
|
|
CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()-> {try {
|
|
|
DockerExe.getDockerLogs(pid,new ResultCallback.Adapter<Frame>() {
|
|
|
@Override
|
