|
@@ -1,6 +1,7 @@
|
|
package com.miniframe.bisiness.es;
|
|
package com.miniframe.bisiness.es;
|
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
|
|
+import java.util.Date;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
@@ -9,10 +10,14 @@ import com.github.dockerjava.api.model.Frame;
|
|
import com.miniframe.core.ExecProcessFlow;
|
|
import com.miniframe.core.ExecProcessFlow;
|
|
import com.miniframe.core.ext.UtilTools;
|
|
import com.miniframe.core.ext.UtilTools;
|
|
import com.miniframe.generate.business.es.model.ES0013BaseModel;
|
|
import com.miniframe.generate.business.es.model.ES0013BaseModel;
|
|
|
|
+import com.miniframe.mappers.es.dao.EsMapper;
|
|
|
|
+import com.miniframe.model.es.EsProJob;
|
|
|
|
+import com.miniframe.model.es.dao.EsProJobMapper;
|
|
import com.miniframe.tools.XIFileUtils;
|
|
import com.miniframe.tools.XIFileUtils;
|
|
import com.miniframe.tools.docker.DockerExe;
|
|
import com.miniframe.tools.docker.DockerExe;
|
|
import es.service.LogService;
|
|
import es.service.LogService;
|
|
import es.template.TemplateGenerator;
|
|
import es.template.TemplateGenerator;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 无锡发动机,“项目求解”逻辑处理(重新生成不覆盖)。
|
|
* 无锡发动机,“项目求解”逻辑处理(重新生成不覆盖)。
|
|
@@ -32,6 +37,22 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
|
|
XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate");
|
|
XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate");
|
|
XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate/Geometry");//几何路径
|
|
XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate/Geometry");//几何路径
|
|
TemplateGenerator.createPipenetXml(pid);
|
|
TemplateGenerator.createPipenetXml(pid);
|
|
|
|
+
|
|
|
|
+ EsProJobMapper epjDao = UtilTools.getBean(EsProJobMapper.class);
|
|
|
|
+ EsProJob esjob = new EsProJob();
|
|
|
|
+ esjob.setJobId(UtilTools.getUUid());
|
|
|
|
+ esjob.setPid(pid);
|
|
|
|
+ esjob.setStartTime(new Date());
|
|
|
|
+ esjob.setEndTime(new Date());
|
|
|
|
+ EsMapper esMapper = UtilTools.getBean(EsMapper.class);
|
|
|
|
+ Integer maxser =esMapper.getProJobSer(pid);
|
|
|
|
+ maxser=maxser==null?0:maxser;
|
|
|
|
+ esjob.setSer(maxser+1);
|
|
|
|
+ esjob.setUid(this.getA_eshead().getUserId());
|
|
|
|
+ esjob.setCreateTime(new Date());
|
|
|
|
+ esjob.setUpdateTime(new Date());
|
|
|
|
+ esjob.setRemark("");
|
|
|
|
+ epjDao.insert(esjob);
|
|
run(pid);
|
|
run(pid);
|
|
}
|
|
}
|
|
private void run(String pid) throws Exception {
|
|
private void run(String pid) throws Exception {
|