Unverified Commit c29e2f1a authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #117 from qiaozhanwei/dev-20190415 

command count update
parents f0b4ee97 7c3f5b61

escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java

+23 −7
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package cn.escheduler.api.service;

package cn.escheduler.api.service;









import cn.escheduler.api.dto.CommandStateCount;

import cn.escheduler.api.dto.DefineUserDto;

import cn.escheduler.api.dto.DefineUserDto;

import cn.escheduler.api.dto.TaskCountDto;

import cn.escheduler.api.dto.TaskCountDto;

import cn.escheduler.api.enums.Status;

import cn.escheduler.api.enums.Status;
@@ -38,10 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.stereotype.Service;

import org.springframework.stereotype.Service;





import java.text.MessageFormat;

import java.text.MessageFormat;

import java.util.Date;

import java.util.*;

import java.util.HashMap;

import java.util.List;

import java.util.Map;





/**

/**

 * data analysis service

 * data analysis service
@@ -298,7 +296,16 @@ public class DataAnalysisService { 
            dataMap.put(errorExecutionStatus.getExecutionStatus(),errorCommandStateCountsMap);

            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);

        putMsg(result, Status.SUCCESS);

        return  result;

        return  result;

    }

    }
@@ -356,9 +363,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("taskQueue",taskQueueCount);

        dataMap.put("taskKill",taskKillCount);

        dataMap.put("taskKill",taskKillCount);