From bbd2f2bd0802c3eb5ce14a0a9a08eb25c543e0f2 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Tue, 23 Apr 2019 14:54:26 +0800 Subject: [PATCH 1/2] queue count update --- .../escheduler/api/service/DataAnalysisService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java index d2a3cdf1ca..57c05d0689 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java @@ -356,9 +356,18 @@ public class DataAnalysisService { } } } + Integer taskQueueCount = 0; + Integer taskKillCount = 0; + + if (tasksQueueIds.length != 0){ + taskQueueCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds); + } + + if (tasksQueueIds.length != 0){ + taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds); + } + - Integer taskQueueCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds); - Integer taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds); dataMap.put("taskQueue",taskQueueCount); dataMap.put("taskKill",taskKillCount); From 7c3f5b61d3d05ba860fad3c19b3289aefeee9d1f Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Tue, 23 Apr 2019 18:23:56 +0800 Subject: [PATCH 2/2] command count update --- .../api/service/DataAnalysisService.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java index 57c05d0689..7462519ca1 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java @@ -17,6 +17,7 @@ package cn.escheduler.api.service; +import cn.escheduler.api.dto.CommandStateCount; import cn.escheduler.api.dto.DefineUserDto; import cn.escheduler.api.dto.TaskCountDto; import cn.escheduler.api.enums.Status; @@ -38,10 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.MessageFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * data analysis service @@ -298,7 +296,16 @@ public class DataAnalysisService { dataMap.put(errorExecutionStatus.getExecutionStatus(),errorCommandStateCountsMap); } - result.put(Constants.DATA_LIST, dataMap); + List list = new ArrayList<>(); + Iterator>> iterator = dataMap.entrySet().iterator(); + while (iterator.hasNext()){ + Map.Entry> next = iterator.next(); + CommandStateCount commandStateCount = new CommandStateCount(next.getValue().get("errorCommandState"), + next.getValue().get("commandState"),next.getKey()); + list.add(commandStateCount); + } + + result.put(Constants.DATA_LIST, list); putMsg(result, Status.SUCCESS); return result; }