1 files changed, 27 insertions, 23 deletions
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js
index 65d1fc3d..f0e0605c 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js
@@ -20,30 +20,34 @@ app.controller("alarmDetailsController",function ($scope,$http,$window) {
     };
     $http({
         method : "GET",
-        url : global_url + "/alarm/1/1/null/"+alarmDetailId+"/null/null/null/null"
+        url : global_url + "/alarm/1/1/"+alarmDetailId+"/null/null/null/null/null"
     }).then(function successCallback(resp) {
-        $scope.alarmCondition = resp.data.alarms[0].alarmsHeader.alarmCondition;
-        $scope.alarmInterfaceA = resp.data.alarms[0].alarmsHeader.alarmInterfaceA;
-        $scope.eventCategory = resp.data.alarms[0].alarmsHeader.eventCategory;
-        $scope.eventId = resp.data.alarms[0].alarmsHeader.eventId;
-        $scope.eventName = resp.data.alarms[0].alarmsHeader.eventName;
-        $scope.eventServrity = resp.data.alarms[0].alarmsHeader.eventServrity;
-        $scope.eventSourceType = resp.data.alarms[0].alarmsHeader.eventSourceType;
-        $scope.eventType = resp.data.alarms[0].alarmsHeader.eventType;
-        $scope.faultFieldsVersion = resp.data.alarms[0].alarmsHeader.faultFieldsVersion;
-        $scope.lastEpochMicroSec = resp.data.alarms[0].alarmsHeader.lastEpochMicroSec;
-        $scope.nfNamingCode = resp.data.alarms[0].alarmsHeader.nfNamingCode;
-        $scope.nfcNamingCode = resp.data.alarms[0].alarmsHeader.nfcNamingCode;
-        $scope.priority = resp.data.alarms[0].alarmsHeader.priority;
-        $scope.reportingEntityId = resp.data.alarms[0].alarmsHeader.reportingEntityId;
-        $scope.reportingEntityName = resp.data.alarms[0].alarmsHeader.reportingEntityName;
-        $scope.sequence = resp.data.alarms[0].alarmsHeader.sequence;
-        $scope.sourceId = resp.data.alarms[0].alarmsHeader.sourceId;
-        $scope.sourceName = resp.data.alarms[0].alarmsHeader.sourceName;
-        $scope.specificProblem = resp.data.alarms[0].alarmsHeader.specificProblem;
-        $scope.startEpochMicrosec = resp.data.alarms[0].alarmsHeader.startEpochMicrosec;
-        $scope.startTIme = resp.data.alarms[0].alarmsHeader.createTime;
-        $scope.alarmInformation = resp.data.alarms[0].alarmsInformation;
+        if (resp.data.alarms.length > 0){
+            $scope.alarmCondition = resp.data.alarms[0].alarmsHeader.alarmCondition;
+            $scope.alarmInterfaceA = resp.data.alarms[0].alarmsHeader.alarmInterfaceA;
+            $scope.eventCategory = resp.data.alarms[0].alarmsHeader.eventCategory;
+            $scope.eventId = resp.data.alarms[0].alarmsHeader.eventId;
+            $scope.eventName = resp.data.alarms[0].alarmsHeader.eventName;
+            $scope.eventServrity = resp.data.alarms[0].alarmsHeader.eventServrity;
+            $scope.eventSourceType = resp.data.alarms[0].alarmsHeader.eventSourceType;
+            $scope.eventType = resp.data.alarms[0].alarmsHeader.eventType;
+            $scope.faultFieldsVersion = resp.data.alarms[0].alarmsHeader.faultFieldsVersion;
+            $scope.lastEpochMicroSec = resp.data.alarms[0].alarmsHeader.lastEpochMicroSec;
+            $scope.nfNamingCode = resp.data.alarms[0].alarmsHeader.nfNamingCode;
+            $scope.nfcNamingCode = resp.data.alarms[0].alarmsHeader.nfcNamingCode;
+            $scope.priority = resp.data.alarms[0].alarmsHeader.priority;
+            $scope.reportingEntityId = resp.data.alarms[0].alarmsHeader.reportingEntityId;
+            $scope.reportingEntityName = resp.data.alarms[0].alarmsHeader.reportingEntityName;
+            $scope.sequence = resp.data.alarms[0].alarmsHeader.sequence;
+            $scope.sourceId = resp.data.alarms[0].alarmsHeader.sourceId;
+            $scope.sourceName = resp.data.alarms[0].alarmsHeader.sourceName;
+            $scope.specificProblem = resp.data.alarms[0].alarmsHeader.specificProblem;
+            $scope.startEpochMicrosec = resp.data.alarms[0].alarmsHeader.startEpochMicrosec;
+            $scope.startTIme = resp.data.alarms[0].alarmsHeader.createTime;
+            $scope.alarmInformation = resp.data.alarms[0].alarmsInformation;
+        }else {
+            alert("No Data!");
+        }
     },function errorCallback(resq) {
 
     });