Browse Source

Delete the process instance and delete the corresponding queue information,update

pull/2/head
qiaozhanwei 5 years ago
parent
commit
702a64c43f
  1. 4
      escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java

4
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java

@ -465,6 +465,7 @@ public class ProcessInstanceService extends BaseDAGService {
return checkResult; return checkResult;
} }
ProcessInstance processInstance = processDao.findProcessInstanceDetailById(processInstanceId); ProcessInstance processInstance = processDao.findProcessInstanceDetailById(processInstanceId);
List<TaskInstance> taskInstanceList = processDao.findValidTaskListByProcessId(processInstanceId);
//process instance priority //process instance priority
int processInstancePriority = processInstance.getProcessInstancePriority().ordinal(); int processInstancePriority = processInstance.getProcessInstancePriority().ordinal();
if (processInstance == null) { if (processInstance == null) {
@ -477,7 +478,6 @@ public class ProcessInstanceService extends BaseDAGService {
processDao.deleteWorkProcessMapByParentId(processInstanceId); processDao.deleteWorkProcessMapByParentId(processInstanceId);
if (delete > 0) { if (delete > 0) {
List<TaskInstance> taskInstanceList = processDao.findValidTaskListByProcessId(processInstanceId);
if (CollectionUtils.isNotEmpty(taskInstanceList)){ if (CollectionUtils.isNotEmpty(taskInstanceList)){
for (TaskInstance taskInstance : taskInstanceList){ for (TaskInstance taskInstance : taskInstanceList){
// task instance priority // task instance priority
@ -487,7 +487,7 @@ public class ProcessInstanceService extends BaseDAGService {
logger.info("delete task queue node : {}",nodeValue); logger.info("delete task queue node : {}",nodeValue);
tasksQueue.removeNode(cn.escheduler.common.Constants.SCHEDULER_TASKS_QUEUE, nodeValue); tasksQueue.removeNode(cn.escheduler.common.Constants.SCHEDULER_TASKS_QUEUE, nodeValue);
}catch (Exception e){ }catch (Exception e){
logger.error("delete task queue node : {}",nodeValue); logger.error("delete task queue node : {}", nodeValue);
} }
} }
} }

Loading…
Cancel
Save