|
|
|
@ -24,6 +24,7 @@ import java.net.UnknownHostException;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Optional;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -99,7 +100,11 @@ public class HandleTransInit implements ApplicationRunner {
|
|
|
|
|
public void flushTask(String taskId, int status) {
|
|
|
|
|
List<TaskModel> taskList = taskService.getTaskList();
|
|
|
|
|
if (taskList != null && taskList.size() > 0) {
|
|
|
|
|
TaskModel taskModel = taskList.stream().filter(t -> t.getTaskId().equals(taskId)).findFirst().get();
|
|
|
|
|
Optional<TaskModel> first = taskList.stream().filter(t -> t.getTaskId().equals(taskId)).findFirst();
|
|
|
|
|
TaskModel taskModel=null;
|
|
|
|
|
if (first.isPresent()) {
|
|
|
|
|
taskModel = first.get();
|
|
|
|
|
}
|
|
|
|
|
if (taskModel != null) {
|
|
|
|
|
int taskLevel = taskModel.getTaskLevel();
|
|
|
|
|
String task = (String) redisUtil.get("task_identify_" + taskLevel);
|
|
|
|
@ -184,7 +189,7 @@ public class HandleTransInit implements ApplicationRunner {
|
|
|
|
|
String masterTask = (String) redisUtil.get("identify_" + masterTaskId);
|
|
|
|
|
if (StringUtils.isNotBlank(masterTask)) {
|
|
|
|
|
//主任务中排除当前任务
|
|
|
|
|
String collect = Arrays.asList(masterTask.split(",")).stream().filter(t -> !t.equals(task_id)).collect(Collectors.joining(","));
|
|
|
|
|
String collect = Arrays.stream(masterTask.split(",")).filter(t -> !t.equals(task_id)).collect(Collectors.joining(","));
|
|
|
|
|
if (StringUtils.isBlank(collect)) {
|
|
|
|
|
//如果主任务下的子任务已清空,删除key
|
|
|
|
|
redisUtil.del("identify_" + masterTaskId);
|
|
|
|
|