From cd21a62a0bfdab0b42e5c20b8098f4b21c34a93f Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Wed, 8 Jul 2020 17:08:15 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dispose/service/impl/TaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dispose/service/impl/TaskServiceImpl.java b/src/main/java/com/dispose/service/impl/TaskServiceImpl.java index 0d88b794..a95b501a 100644 --- a/src/main/java/com/dispose/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/TaskServiceImpl.java @@ -127,7 +127,7 @@ public class TaskServiceImpl implements TaskService { // 查询当前是否有相同能力节点，相同用户，相同处置IP的且正在执行的处置任务，如果存在则忽略该次任务（依照产品需求） List taskList = taskCacheManager.getAllRunningTask() .stream() - .filter(v -> ((taskId == null || taskId == -1L) || Objects.equals(v.getDeviceId(), task.getDeviceId()) || (task.getDeviceId() == -1L)) + .filter(v -> ((taskId == null || taskId == -1L) || Objects.equals(v.getDeviceId(), task.getDeviceId()) || (v.getDeviceId() == -1L)) && Objects.equals(v.getAccountId(), task.getAccountId()) && taskIsRunning(v) && Objects.equals(v.getType(), task.getType())