Fix VNF Alarm Query Bugs

Change-Id: Iae610e8cd2c37f4c695a379e1da4537a0fd198a1
Issue-ID: USECASEUI-165
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
index a2be2c4..470890e 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
@@ -205,16 +205,10 @@ public class AlarmController
                Map<String,List> result = new HashMap<String,List>();\r
        \r
        Map<String,List> allMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, keyVal, keyValIteraVal,format,"");\r
-       //Map<String,List> criticalMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"CRITICAL");\r
-       //Map<String,List> majorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MAJOR");\r
-       //Map<String,List> minorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MINOR");\r
        Map<String,List> closedMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"closed");\r
        Map<String,List> activeMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"active");\r
        result.put("dateList", allMaps.get("dateTime"));\r
        result.put("allList", allMaps.get("dataList"));\r
-       //result.put("criticalList",criticalMaps.get("dataList"));\r
-       //result.put("majorList",majorMaps.get("dataList"));\r
-       //result.put("minorList",minorMaps.get("dataList"));\r
        result.put("closedList",closedMaps.get("dataList"));\r
        result.put("ActiveList",activeMaps.get("dataList"));\r
        return omAlarm.writeValueAsString(result);\r
@@ -243,6 +237,7 @@ public class AlarmController
     public String getStatusCount() throws JsonProcessingException {\r
         List<String> statusCount = new ArrayList<>();\r
 \r
+               statusCount.add(alarmsHeaderService.queryStatusCount("0"));\r
             statusCount.add(alarmsHeaderService.queryStatusCount("active"));\r
             statusCount.add(alarmsHeaderService.queryStatusCount("close"));\r
             return omAlarm.writeValueAsString(statusCount);\r