From: guochuyicmri <guochuyi@chinamobile.com>
Date: Mon, 5 Nov 2018 08:58:31 +0000 (+0800)
Subject: Fix VNF Alarm Query Bugs
X-Git-Tag: 1.2.1~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F71819%2F1;p=usecase-ui%2Fserver.git

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 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<String,List> result = new HashMap<String,List>();
     	
     	Map<String,List> allMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, keyVal, keyValIteraVal,format,"");
-    	//Map<String,List> criticalMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"CRITICAL");
-    	//Map<String,List> majorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MAJOR");
-    	//Map<String,List> minorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MINOR");
     	Map<String,List> closedMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"closed");
     	Map<String,List> 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<String> statusCount = new ArrayList<>();
 
+        	statusCount.add(alarmsHeaderService.queryStatusCount("0"));
             statusCount.add(alarmsHeaderService.queryStatusCount("active"));
             statusCount.add(alarmsHeaderService.queryStatusCount("close"));
             return omAlarm.writeValueAsString(statusCount);