cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 修改创建任务的接口
This commit is contained in:
chenlinghy 2020-07-08 17:08:15 +08:00
parent a0fd182478
commit cd21a62a0b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dispose/service/impl/TaskServiceImpl.java
View File

@ -127,7 +127,7 @@ public class TaskServiceImpl implements TaskService {
// 查询当前是否有相同能力节点，相同用户，相同处置IP的且正在执行的处置任务，如果存在则忽略该次任务（依照产品需求） // 查询当前是否有相同能力节点，相同用户，相同处置IP的且正在执行的处置任务，如果存在则忽略该次任务（依照产品需求）
List<TaskInfoDetail> taskList = taskCacheManager.getAllRunningTask() List<TaskInfoDetail> taskList = taskCacheManager.getAllRunningTask()
.stream() .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()) && Objects.equals(v.getAccountId(), task.getAccountId())
&& taskIsRunning(v) && taskIsRunning(v)
&& Objects.equals(v.getType(), task.getType()) && Objects.equals(v.getType(), task.getType())