Commit 7c3f5b61 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

command count update

parent bbd2f2bd
Loading
Loading
Loading
Loading
+12 −5
Original line number Diff line number Diff line
@@ -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<CommandStateCount> list = new ArrayList<>();
        Iterator<Map.Entry<ExecutionStatus, Map<String, Integer>>> iterator = dataMap.entrySet().iterator();
        while (iterator.hasNext()){
            Map.Entry<ExecutionStatus, Map<String, Integer>> 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;
    }