|
|
|
@ -239,17 +239,15 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
|
|
|
|
|
this.updateById(taskRecord);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 更新任务状态
|
|
|
|
|
List<TaskCaseRecord> taskCaseRecords = taskCaseRecordService.queryByTaskId(taskId);
|
|
|
|
|
String taskStatus = this.determineStatus(taskCaseRecords);
|
|
|
|
|
log.info("completeTask:任务ID:【{}】,初始任务状态:【{}】,计算后任务状态:【{}】", taskId, taskCaseRecord.getStatus(),taskStatus);
|
|
|
|
|
if (!StrUtil.equals(taskStatus,taskRecord.getStatus())){
|
|
|
|
|
taskRecord.setStatus(taskStatus);
|
|
|
|
|
super.updateById(taskRecord);
|
|
|
|
|
if (StrUtil.equalsAny(taskRecord.getStatus(),TASK_STATUS_WAITING,TASK_STATUS_PROCESSING)){
|
|
|
|
|
List<TaskCaseRecord> taskCaseRecords = taskCaseRecordService.queryByTaskId(taskId);
|
|
|
|
|
String taskStatus = this.determineStatus(taskCaseRecords);
|
|
|
|
|
log.info("completeTask:任务ID:【{}】,初始任务状态:【{}】,计算后任务状态:【{}】", taskId, taskCaseRecord.getStatus(),taskStatus);
|
|
|
|
|
if (!StrUtil.equals(taskStatus,taskRecord.getStatus())){
|
|
|
|
|
taskRecord.setStatus(taskStatus);
|
|
|
|
|
super.updateById(taskRecord);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -257,11 +255,11 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
|
|
|
|
|
if (CollUtil.isEmpty(taskCaseRecords)){
|
|
|
|
|
return TASK_STATUS_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
//todo: 规则定下来再确定
|
|
|
|
|
|
|
|
|
|
// 有一组失败的,则任务失败
|
|
|
|
|
taskCaseRecords.stream().filter(taskCaseRecord -> StrUtil.isNotEmpty(taskCaseRecord.getExceptionId()));
|
|
|
|
|
return TASK_STATUS_FAIL;
|
|
|
|
|
// 所有任务状态都是终止状态,则任务状态为成功
|
|
|
|
|
boolean finished = taskCaseRecords.stream().allMatch(taskCaseRecord ->
|
|
|
|
|
StrUtil.equalsAny(taskCaseRecord.getStatus(), TASK_STATUS_CANCELED, TASK_STATUS_SUCCESS, TASK_STATUS_FAIL));
|
|
|
|
|
return finished ? TASK_STATUS_SUCCESS : TASK_STATUS_PROCESSING;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|