|
|
@ -164,7 +164,7 @@ public class ProcessService { |
|
|
|
* @param command found command |
|
|
|
* @param command found command |
|
|
|
* @return process instance |
|
|
|
* @return process instance |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = RuntimeException.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public ProcessInstance handleCommand(Logger logger, String host, int validThreadNum, Command command) { |
|
|
|
public ProcessInstance handleCommand(Logger logger, String host, int validThreadNum, Command command) { |
|
|
|
ProcessInstance processInstance = constructProcessInstance(command, host); |
|
|
|
ProcessInstance processInstance = constructProcessInstance(command, host); |
|
|
|
//cannot construct process instance, return null;
|
|
|
|
//cannot construct process instance, return null;
|
|
|
@ -190,7 +190,7 @@ public class ProcessService { |
|
|
|
* @param command command |
|
|
|
* @param command command |
|
|
|
* @param message message |
|
|
|
* @param message message |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = RuntimeException.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void moveToErrorCommand(Command command, String message) { |
|
|
|
public void moveToErrorCommand(Command command, String message) { |
|
|
|
ErrorCommand errorCommand = new ErrorCommand(command, message); |
|
|
|
ErrorCommand errorCommand = new ErrorCommand(command, message); |
|
|
|
this.errorCommandMapper.insert(errorCommand); |
|
|
|
this.errorCommandMapper.insert(errorCommand); |
|
|
@ -888,8 +888,8 @@ public class ProcessService { |
|
|
|
* @param taskInstance taskInstance |
|
|
|
* @param taskInstance taskInstance |
|
|
|
* @return task instance |
|
|
|
* @return task instance |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = RuntimeException.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public TaskInstance submitTask(TaskInstance taskInstance) { |
|
|
|
public TaskInstance submitTask(TaskInstance taskInstance){ |
|
|
|
ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId()); |
|
|
|
ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId()); |
|
|
|
logger.info("start submit task : {}, instance id:{}, state: {}", |
|
|
|
logger.info("start submit task : {}, instance id:{}, state: {}", |
|
|
|
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState()); |
|
|
|
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState()); |
|
|
@ -967,9 +967,8 @@ public class ProcessService { |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* create sub work process command |
|
|
|
* create sub work process command |
|
|
|
* |
|
|
|
|
|
|
|
* @param parentProcessInstance parentProcessInstance |
|
|
|
* @param parentProcessInstance parentProcessInstance |
|
|
|
* @param task task |
|
|
|
* @param task task |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) { |
|
|
|
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) { |
|
|
|
if (!task.isSubProcess()) { |
|
|
|
if (!task.isSubProcess()) { |
|
|
|