From cebeb16eef83b6e95e702b1fd8954fd96fe995d1 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Mon, 5 Nov 2018 16:58:31 +0800 Subject: [PATCH] Fix VNF Alarm Query Bugs Change-Id: Iae610e8cd2c37f4c695a379e1da4537a0fd198a1 Issue-ID: USECASEUI-165 Signed-off-by: guochuyicmri --- .../java/org/onap/usecaseui/server/controller/AlarmController.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 a2be2c4c..470890e0 100755 --- 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 result = new HashMap(); Map allMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, keyVal, keyValIteraVal,format,""); - //Map criticalMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"CRITICAL"); - //Map majorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MAJOR"); - //Map minorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MINOR"); Map closedMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"closed"); Map activeMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"active"); result.put("dateList", allMaps.get("dateTime")); result.put("allList", allMaps.get("dataList")); - //result.put("criticalList",criticalMaps.get("dataList")); - //result.put("majorList",majorMaps.get("dataList")); - //result.put("minorList",minorMaps.get("dataList")); result.put("closedList",closedMaps.get("dataList")); result.put("ActiveList",activeMaps.get("dataList")); return omAlarm.writeValueAsString(result); @@ -243,6 +237,7 @@ public class AlarmController public String getStatusCount() throws JsonProcessingException { List statusCount = new ArrayList<>(); + statusCount.add(alarmsHeaderService.queryStatusCount("0")); statusCount.add(alarmsHeaderService.queryStatusCount("active")); statusCount.add(alarmsHeaderService.queryStatusCount("close")); return omAlarm.writeValueAsString(statusCount); -- 2.16.6