summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2018-11-05 16:58:31 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2018-11-05 16:58:39 +0800
commitcebeb16eef83b6e95e702b1fd8954fd96fe995d1 (patch)
tree4712bc3fa4dcb4f4942e5aae6e44db8093d12377
parent594f3f753e2d2e200bf88ab1f922f9ddd406dd61 (diff)
Fix VNF Alarm Query Bugs
Change-Id: Iae610e8cd2c37f4c695a379e1da4537a0fd198a1 Issue-ID: USECASEUI-165 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
-rwxr-xr-xserver/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java7
1 files changed, 1 insertions, 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<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);