Fix VNF Alarm Query Bugs

Change-Id: I7cecce26ce2b1837e682574c7c8de7ae5d584c72
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 2b0b641..a2be2c4 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
@@ -171,7 +171,7 @@ public class AlarmController
     }\r
     \r
     @RequestMapping(value = {"/alarm/diagram"},method = RequestMethod.POST,produces = "application/json")\r
-    public String diagram(@RequestParam String sourceId, @RequestParam String startTime, @RequestParam String endTime, @RequestParam String format) {\r
+    public String diagram(@RequestParam String sourceName, @RequestParam String startTime, @RequestParam String endTime, @RequestParam String format) {\r
         long timeInterval = 0;\r
        try {\r
                if("month".equals(format)){//alarm   day month year\r
@@ -192,7 +192,7 @@ public class AlarmController
                sdf = new SimpleDateFormat(formatDate);\r
             long startTimel = sdf.parse(startTime).getTime();\r
             long endTimel = sdf.parse(endTime).getTime();\r
-            return getDiagram(sourceId, startTimel, endTimel+timeInterval, timeInterval, 1, 1,format);\r
+            return getDiagram(sourceName, startTimel, endTimel+timeInterval, timeInterval, 1, 1,format);\r
         } catch (Exception e) {\r
                logger.error("alarmController diagram occured exception:"+e.getMessage());\r
             e.printStackTrace();\r
@@ -201,15 +201,15 @@ public class AlarmController
     }\r
     \r
     @SuppressWarnings("rawtypes")\r
-    private  String getDiagram(String sourceId, long startTimeL, long endTimeL, long timeIteraPlusVal, long keyVal, long keyValIteraVal,String format) throws JsonProcessingException{\r
+    private  String getDiagram(String sourceName, long startTimeL, long endTimeL, long timeIteraPlusVal, long keyVal, long keyValIteraVal,String format) throws JsonProcessingException{\r
                Map<String,List> result = new HashMap<String,List>();\r
        \r
-       Map<String,List> allMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, keyVal, keyValIteraVal,format,"");\r
+       Map<String,List> allMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, keyVal, keyValIteraVal,format,"");\r
        //Map<String,List> criticalMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"CRITICAL");\r
        //Map<String,List> majorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MAJOR");\r
        //Map<String,List> minorMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"MINOR");\r
-       Map<String,List> closedMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"closed");\r
-       Map<String,List> activeMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"active");\r
+       Map<String,List> closedMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"closed");\r
+       Map<String,List> activeMaps = dateProcess(sourceName, startTimeL, endTimeL, timeIteraPlusVal, 1, 1,format,"active");\r
        result.put("dateList", allMaps.get("dateTime"));\r
        result.put("allList", allMaps.get("dataList"));\r
        //result.put("criticalList",criticalMaps.get("dataList"));\r
@@ -219,13 +219,13 @@ public class AlarmController
        result.put("ActiveList",activeMaps.get("dataList"));\r
        return omAlarm.writeValueAsString(result);\r
     }\r
-    private Map<String,List> dateProcess(String sourceId, long startTimeL, long endTimeL, long timeIteraPlusVal, long keyVal, long keyValIteraVal,String format,String level) {\r
+    private Map<String,List> dateProcess(String sourceName, long startTimeL, long endTimeL, long timeIteraPlusVal, long keyVal, long keyValIteraVal,String format,String level) {\r
        Map<String,List> result = new HashMap<String,List>();\r
         List<String> dateList = new ArrayList<String>();\r
         List<Integer> numList = new ArrayList<Integer>();\r
         long tmpEndTimeL = startTimeL + timeIteraPlusVal;\r
         while (endTimeL >= tmpEndTimeL) {\r
-            int num = alarmsInformationService.queryDateBetween(sourceId,startTimeL+"",tmpEndTimeL+"",level);\r
+            int num = alarmsInformationService.queryDateBetween(sourceName,startTimeL+"",tmpEndTimeL+"",level);\r
             dateList.add(DateUtils.getResultDate(startTimeL, format));\r
             int maxDay2 = DateUtils.MonthOfDay(sdf.format(new Date(tmpEndTimeL)), formatDate);\r
             int maxDay = DateUtils.MonthOfDay(sdf.format(new Date(startTimeL)), formatDate);\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
index 7a6c04b..b44a5c2 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
@@ -191,14 +191,14 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
 \r
 \r
        @Override\r
-       public int queryDateBetween(String sourceId, String startTime, String endTime,String status) {\r
+       public int queryDateBetween(String sourceName, String startTime, String endTime,String status) {\r
                if("1526554800000".equals(startTime)){\r
                        System.out.print(startTime);\r
                }\r
                try(Session session = getSession()) {\r
                        String hql = "select count(*) from AlarmsHeader a where 1=1 ";\r
-                       if (sourceId != null && !"".equals(sourceId)){\r
-                               hql += " and a.sourceId = :sourceId";\r
+                       if (sourceName != null && !"".equals(sourceName)){\r
+                               hql += " and a.sourceName = :sourceName";\r
                        }\r
                        if (UuiCommonUtil.isNotNullOrEmpty(status)){\r
                                hql += " and a.status = :status";\r
@@ -207,8 +207,8 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
                                hql += " and (CASE WHEN a.startEpochMicrosec=0 THEN a.lastEpochMicroSec ELSE a.startEpochMicrosec END) between :startTime and :endTime ";\r
                        }\r
                        Query query = session.createQuery(hql);\r
-                       if (sourceId != null && !"".equals(sourceId)){\r
-                               query.setString("sourceId",sourceId);\r
+                       if (sourceName != null && !"".equals(sourceName)){\r
+                               query.setString("sourceName",sourceName);\r
                        }\r
                        if (UuiCommonUtil.isNotNullOrEmpty(status)){\r
                                query.setString("status",status);\r