|
@@ -3,6 +3,7 @@ package com.miniframe.solverjob;
|
|
import com.miniframe.core.ext.UtilTools;
|
|
import com.miniframe.core.ext.UtilTools;
|
|
import com.miniframe.model.system.AdiSolverConfig;
|
|
import com.miniframe.model.system.AdiSolverConfig;
|
|
import com.miniframe.model.system.AdiSolverJob;
|
|
import com.miniframe.model.system.AdiSolverJob;
|
|
|
|
+import com.miniframe.model.system.dao.AdiSolverConfigMapper;
|
|
import com.miniframe.model.system.dao.AdiSolverJobMapper;
|
|
import com.miniframe.model.system.dao.AdiSolverJobMapper;
|
|
import com.miniframe.tools.XIDateTimeUtils;
|
|
import com.miniframe.tools.XIDateTimeUtils;
|
|
|
|
|
|
@@ -24,6 +25,12 @@ public class AdiSolverJobService {
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
job.setState(-1);//待执行
|
|
job.setState(-1);//待执行
|
|
jobDao.insert(job);
|
|
jobDao.insert(job);
|
|
|
|
+
|
|
|
|
+ AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
|
|
|
|
+// AdiSolverConfig config =configDao.selectByPrimaryKey(job.getConfigid());
|
|
|
|
+ config.setState((short)-1);
|
|
|
|
+ config.setSolverNum(config.getSolverNum()+1);
|
|
|
|
+ configDao.updateByPrimaryKey(config);
|
|
return job;
|
|
return job;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
@@ -31,12 +38,17 @@ public class AdiSolverJobService {
|
|
* @param
|
|
* @param
|
|
*/
|
|
*/
|
|
public static AdiSolverJob exeJob(AdiSolverJob job){
|
|
public static AdiSolverJob exeJob(AdiSolverJob job){
|
|
- job.setId(UtilTools.getUUid());
|
|
|
|
String now = XIDateTimeUtils.getNowStr();
|
|
String now = XIDateTimeUtils.getNowStr();
|
|
job.setStartexeTime(now);
|
|
job.setStartexeTime(now);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
job.setState(0);//执行中
|
|
job.setState(0);//执行中
|
|
jobDao.updateByPrimaryKey(job);
|
|
jobDao.updateByPrimaryKey(job);
|
|
|
|
+
|
|
|
|
+ AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
|
|
|
|
+ AdiSolverConfig config =configDao.selectByPrimaryKey(job.getConfigid());
|
|
|
|
+ config.setState((short)0);
|
|
|
|
+ config.setSolverStime(XIDateTimeUtils.getNowDate());
|
|
|
|
+ configDao.updateByPrimaryKey(config);
|
|
return job;
|
|
return job;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
@@ -44,13 +56,18 @@ public class AdiSolverJobService {
|
|
* @param
|
|
* @param
|
|
*/
|
|
*/
|
|
public static AdiSolverJob overSucessJob(AdiSolverJob job){
|
|
public static AdiSolverJob overSucessJob(AdiSolverJob job){
|
|
- job.setId(UtilTools.getUUid());
|
|
|
|
String now = XIDateTimeUtils.getNowStr();
|
|
String now = XIDateTimeUtils.getNowStr();
|
|
job.setEndexeTime(now);
|
|
job.setEndexeTime(now);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
job.setState(1);//任务执行完成
|
|
job.setState(1);//任务执行完成
|
|
job.setResultsState(1);//执行成功
|
|
job.setResultsState(1);//执行成功
|
|
jobDao.updateByPrimaryKey(job);
|
|
jobDao.updateByPrimaryKey(job);
|
|
|
|
+
|
|
|
|
+ AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
|
|
|
|
+ AdiSolverConfig config =configDao.selectByPrimaryKey(job.getConfigid());
|
|
|
|
+ config.setState((short)0);
|
|
|
|
+ config.setSolverEtime(XIDateTimeUtils.getNowDate());
|
|
|
|
+ configDao.updateByPrimaryKey(config);
|
|
return job;
|
|
return job;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
@@ -58,13 +75,17 @@ public class AdiSolverJobService {
|
|
* @param
|
|
* @param
|
|
*/
|
|
*/
|
|
public static AdiSolverJob overFailJob(AdiSolverJob job){
|
|
public static AdiSolverJob overFailJob(AdiSolverJob job){
|
|
- job.setId(UtilTools.getUUid());
|
|
|
|
String now = XIDateTimeUtils.getNowStr();
|
|
String now = XIDateTimeUtils.getNowStr();
|
|
job.setEndexeTime(now);
|
|
job.setEndexeTime(now);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
|
|
job.setState(1);//任务执行完成
|
|
job.setState(1);//任务执行完成
|
|
job.setResultsState(-1);//求解失败
|
|
job.setResultsState(-1);//求解失败
|
|
jobDao.updateByPrimaryKey(job);
|
|
jobDao.updateByPrimaryKey(job);
|
|
|
|
+
|
|
|
|
+ AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
|
|
|
|
+ AdiSolverConfig config =configDao.selectByPrimaryKey(job.getConfigid());
|
|
|
|
+ config.setState((short)0);
|
|
|
|
+ config.setSolverEtime(XIDateTimeUtils.getNowDate());
|
|
return job;
|
|
return job;
|
|
}
|
|
}
|
|
}
|
|
}
|