From: guochuyicmri <guochuyi@chinamobile.com>
Date: Wed, 31 Oct 2018 02:12:40 +0000 (+0800)
Subject: update getAlarmListData
X-Git-Tag: 1.2.1~25
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F14%2F71514%2F1;p=usecase-ui%2Fserver.git

update getAlarmListData

Change-Id: I1d607a67b2912d32bf49e478954f247978f1f8ee
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 1a032c48..091df4a9 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
@@ -105,13 +105,13 @@ public class AlarmController
     public String getAlarmData(@PathVariable(required = false) String sourceName,
                                @PathVariable(required = false) String priority,@PathVariable(required = false) String startTime,
                                @PathVariable(required = false) String endTime,@PathVariable(required = false) String vfStatus,
-                               @PathVariable int currentPage, @PathVariable int pageSize) throws JsonProcessingException, ParseException {
+                               @PathVariable String currentPage, @PathVariable String pageSize) throws JsonProcessingException, ParseException {
             AlarmsHeader alarm = new AlarmsHeader();
             alarm.setSourceName(sourceName);
             alarm.setStatus(vfStatus);
-            alarm.setStartEpochMicrosec(UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+"");
-            alarm.setLastEpochMicroSec(UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+"");
-            Page  pa = alarmsHeaderService.queryAlarmsHeader(alarm,currentPage,pageSize);
+            alarm.setStartEpochMicrosec(!UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+"");
+            alarm.setLastEpochMicroSec(!UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+"");
+            Page  pa = alarmsHeaderService.queryAlarmsHeader(alarm,Integer.parseInt(currentPage),Integer.parseInt(pageSize));
         try {
             Map<String,Object> map = new HashMap<>();
             map.put("alarms",pa.getList());
diff --git a/server/src/test/java/org/onap/usecaseui/server/controller/AlarmControllerTest.java b/server/src/test/java/org/onap/usecaseui/server/controller/AlarmControllerTest.java
index 0054ab10..3bce961d 100755
--- a/server/src/test/java/org/onap/usecaseui/server/controller/AlarmControllerTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/controller/AlarmControllerTest.java
@@ -60,8 +60,8 @@ public class AlarmControllerTest {
 	@Test
 	public void testGetAlarmData() throws Exception {
 		try {
-			controller.getAlarmData("sourceName", "priority", "startTime", "endTime", "vfStatus", 1, 10);
-			controller.getAlarmData(null, null, null, null, null, 1, 10);
+			controller.getAlarmData("sourceName", "priority", "startTime", "endTime", "vfStatus", "1", "10");
+			controller.getAlarmData(null, null, null, null, null, "1", "10");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}