From fd87b1fc0da0460688656b163e321c21a7c66c7f Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Wed, 8 Jul 2020 17:58:23 +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,?= =?UTF-8?q?=E5=BD=93=E8=AE=BE=E5=A4=87Id=E4=B8=BA-1=EF=BC=8C=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=94=A8=E6=88=B7=EF=BC=8C=E7=9B=B8=E5=90=8C=E5=A4=84?= =?UTF-8?q?=E7=BD=AEIP=E7=9A=84=E4=B8=94=E6=AD=A3=E5=9C=A8=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E5=A4=84=E7=BD=AE=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E5=88=99=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E8=AF=A5=E6=AC=A1=E4=BB=BB=E5=8A=A1=E3=80=82?= 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 cf97cbb6..9316598d 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())) + .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())