Merge "Upgrade oparent version to 1.2.3"

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 be72cc7..e217fe7 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
@@ -32,6 +32,7 @@ import org.onap.usecaseui.server.bean.AlarmsInformation;
 import org.onap.usecaseui.server.constant.Constant;\r
 import org.onap.usecaseui.server.service.AlarmsHeaderService;\r
 import org.onap.usecaseui.server.service.AlarmsInformationService;\r
+import org.onap.usecaseui.server.util.DateProcessDataObject;\r
 import org.onap.usecaseui.server.util.DateUtils;\r
 import org.onap.usecaseui.server.util.Page;\r
 import org.onap.usecaseui.server.util.UuiCommonUtil;\r
@@ -98,26 +99,30 @@ public class AlarmController
         * test commit\r
         * @throws ParseException \r
         */\r
-    @RequestMapping(value = {"/alarm/{currentPage}/{pageSize}"},\r
-            method = RequestMethod.GET , produces = "application/json")\r
+    @RequestMapping(value = {"/alarm/{currentPage}/{pageSize}"}, method = RequestMethod.GET,\r
+            produces = "application/json")\r
     public String getAlarmData(@RequestParam(required = false) String sourceName,\r
-               @RequestParam(required = false) String priority,@RequestParam(required = false) String startTime,\r
-               @RequestParam(required = false) String endTime,@RequestParam(required = false) String vfStatus,\r
-                               @PathVariable String currentPage, @PathVariable String pageSize) throws JsonProcessingException, ParseException {\r
-            AlarmsHeader alarm = new AlarmsHeader();\r
-            alarm.setSourceName(sourceName);\r
-            alarm.setStatus(vfStatus);\r
-            alarm.setStartEpochMicrosec(!UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+"");\r
-            alarm.setLastEpochMicroSec(!UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+"");\r
-            Page  pa = alarmsHeaderService.queryAlarmsHeader(alarm,Integer.parseInt(currentPage),Integer.parseInt(pageSize));\r
+            @RequestParam(required = false) String priority, @RequestParam(required = false) String startTime,\r
+            @RequestParam(required = false) String endTime, @RequestParam(required = false) String vfStatus,\r
+            @PathVariable String currentPage, @PathVariable String pageSize)\r
+            throws JsonProcessingException, ParseException {\r
+        AlarmsHeader alarm = new AlarmsHeader();\r
+        alarm.setSourceName(sourceName);\r
+        alarm.setStatus(vfStatus);\r
+        alarm.setStartEpochMicrosec(!UuiCommonUtil.isNotNullOrEmpty(startTime) ? null\r
+                : new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime() + "");\r
+        alarm.setLastEpochMicroSec(!UuiCommonUtil.isNotNullOrEmpty(endTime) ? null\r
+                : new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime() + "");\r
+        Page pa =\r
+                alarmsHeaderService.queryAlarmsHeader(alarm, Integer.parseInt(currentPage), Integer.parseInt(pageSize));\r
         try {\r
-            Map<String,Object> map = new HashMap<>();\r
-            map.put("alarms",pa.getList());\r
-            map.put("totalRecords",pa.getTotalRecords());\r
+            Map<String, Object> map = new HashMap<>();\r
+            map.put("alarms", pa.getList());\r
+            map.put("totalRecords", pa.getTotalRecords());\r
             omAlarm.setDateFormat(new SimpleDateFormat(Constant.DATE_FORMAT));\r
             return omAlarm.writeValueAsString(map);\r
         } catch (JsonProcessingException e) {\r
-            logger.debug("JsonProcessingException :"+e.getMessage());\r
+            logger.debug("JsonProcessingException :" + e.getMessage());\r
             return omAlarm.writeValueAsString("failed");\r
         }\r
     }\r
@@ -168,59 +173,75 @@ public class AlarmController
     }\r
     \r
     @RequestMapping(value = {"/alarm/diagram"},method = RequestMethod.GET,produces = "application/json")\r
-    public String diagram(@RequestParam String sourceName, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam String format) {\r
+    public String diagram(@RequestParam String sourceName, @RequestParam(required = false) String startTime,\r
+            @RequestParam(required = false) String endTime, @RequestParam String format) {\r
         long timeInterval = 0;\r
-       try {\r
-               if("month".equals(format)){//alarm   day month year\r
-                       formatDate="yyyy-MM";\r
-                       int maxDay= DateUtils.MonthOfDay(startTime, formatDate);\r
-                       timeInterval =86400000L*maxDay;\r
-               }else{\r
-                       formatDate="yyyy-MM-dd";\r
-                       timeInterval =86400000;\r
-               }\r
-               sdf = new SimpleDateFormat(formatDate);\r
+        try {\r
+            if ("month".equals(format)) {// alarm day month year\r
+                formatDate = "yyyy-MM";\r
+                int maxDay = DateUtils.MonthOfDay(startTime, formatDate);\r
+                timeInterval = 86400000L * maxDay;\r
+            } else {\r
+                formatDate = "yyyy-MM-dd";\r
+                timeInterval = 86400000;\r
+            }\r
+            sdf = new SimpleDateFormat(formatDate);\r
             long startTimel = sdf.parse(startTime).getTime();\r
             long endTimel = sdf.parse(endTime).getTime();\r
-            return getDiagram(sourceName, 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
+            logger.error("alarmController diagram occured exception:" + e.getMessage());\r
             e.printStackTrace();\r
         }\r
         return null;\r
     }\r
     \r
     @SuppressWarnings("rawtypes")\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(sourceName, startTimeL, endTimeL, timeIteraPlusVal, keyVal, keyValIteraVal,format,"");\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("closedList",closedMaps.get("dataList"));\r
-       result.put("ActiveList",activeMaps.get("dataList"));\r
-       return omAlarm.writeValueAsString(result);\r
+    private String getDiagram(String sourceName, long startTimeL, long endTimeL, long timeIteraPlusVal, long keyVal,\r
+            long keyValIteraVal, String format) throws JsonProcessingException {\r
+        Map<String, List> result = new HashMap<String, List>();\r
+\r
+        Map<String, List> allMaps = dateProcess(new DateProcessDataObject().setSourceName(sourceName)\r
+                .setStartTimeL(startTimeL).setEndTimeL(endTimeL).setTimeIteraPlusVal(timeIteraPlusVal).setKeyVal(keyVal)\r
+                .setKeyValIteraVal(keyValIteraVal).setFormat(format).setLevel(""));\r
+\r
+        Map<String, List> closedMaps = dateProcess(new DateProcessDataObject().setSourceName(sourceName)\r
+                .setStartTimeL(startTimeL).setEndTimeL(endTimeL).setTimeIteraPlusVal(timeIteraPlusVal).setKeyVal(1)\r
+                .setKeyValIteraVal(1).setFormat(format).setLevel("closed"));\r
+\r
+        Map<String, List> activeMaps = dateProcess(new DateProcessDataObject().setSourceName(sourceName)\r
+                .setStartTimeL(startTimeL).setEndTimeL(endTimeL).setTimeIteraPlusVal(timeIteraPlusVal).setKeyVal(1)\r
+                .setKeyValIteraVal(1).setFormat(format).setLevel("active"));\r
+\r
+        result.put("dateList", allMaps.get("dateTime"));\r
+        result.put("allList", allMaps.get("dataList"));\r
+        result.put("closedList", closedMaps.get("dataList"));\r
+        result.put("ActiveList", activeMaps.get("dataList"));\r
+        return omAlarm.writeValueAsString(result);\r
     }\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
+\r
+    private Map<String, List> dateProcess(DateProcessDataObject dataObject) {\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 maxDay2 = 1;\r
-               int maxDay = 1;\r
-            int num = alarmsInformationService.queryDateBetween(sourceName,startTimeL+"",tmpEndTimeL+"",level);\r
-            dateList.add(DateUtils.getResultDate(startTimeL, format));\r
-            if("month".equals(format)){\r
-               maxDay2 = DateUtils.MonthOfDay(sdf.format(new Date(tmpEndTimeL)), formatDate);\r
-               maxDay = DateUtils.MonthOfDay(sdf.format(new Date(startTimeL)), formatDate);\r
+        long tmpEndTimeL = dataObject.getStartTimeL() + dataObject.getTimeIteraPlusVal();\r
+        while (dataObject.getEndTimeL() >= tmpEndTimeL) {\r
+            int maxDay2 = 1;\r
+            int maxDay = 1;\r
+            int num = alarmsInformationService.queryDateBetween(dataObject.getSourceName(),\r
+                    dataObject.getStartTimeL() + "", tmpEndTimeL + "", dataObject.getLevel());\r
+            dateList.add(DateUtils.getResultDate(dataObject.getStartTimeL(), dataObject.getFormat()));\r
+            if ("month".equals(dataObject.getFormat())) {\r
+                maxDay2 = DateUtils.MonthOfDay(sdf.format(new Date(tmpEndTimeL)), formatDate);\r
+                maxDay = DateUtils.MonthOfDay(sdf.format(new Date(dataObject.getStartTimeL())), formatDate);\r
             }\r
             numList.add(num);\r
-            startTimeL += 86400000L*maxDay;\r
-            tmpEndTimeL += 86400000L*maxDay2;\r
-            keyVal += keyValIteraVal;\r
+            long startTimeL1 = dataObject.getStartTimeL();\r
+            startTimeL1 += 86400000L * maxDay;\r
+            tmpEndTimeL += 86400000L * maxDay2;\r
+            long keyVal1 = dataObject.getKeyVal();\r
+            long keyValIteraVal1 = dataObject.getKeyValIteraVal();\r
+            keyVal1 += keyValIteraVal1;\r
         }\r
         result.put("dateTime", dateList);\r
         result.put("dataList", numList);\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/util/DateProcessDataObject.java b/server/src/main/java/org/onap/usecaseui/server/util/DateProcessDataObject.java
new file mode 100644 (file)
index 0000000..9ee0024
--- /dev/null
+++ b/server/src/main/java/org/onap/usecaseui/server/util/DateProcessDataObject.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Samsung Electronics Co., Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.usecaseui.server.util;
+
+public class DateProcessDataObject {
+    private String sourceName;
+    private long startTimeL;
+    private long endTimeL;
+    private long timeIteraPlusVal;
+    private long keyVal;
+    private long keyValIteraVal;
+    private String format;
+    private String level;
+
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public DateProcessDataObject setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+        return this;
+    }
+
+    public long getStartTimeL() {
+        return startTimeL;
+    }
+
+    public DateProcessDataObject setStartTimeL(long startTimeL) {
+        this.startTimeL = startTimeL;
+        return this;
+    }
+
+    public long getEndTimeL() {
+        return endTimeL;
+    }
+
+    public DateProcessDataObject setEndTimeL(long endTimeL) {
+        this.endTimeL = endTimeL;
+        return this;
+    }
+
+    public long getTimeIteraPlusVal() {
+        return timeIteraPlusVal;
+    }
+
+    public DateProcessDataObject setTimeIteraPlusVal(long timeIteraPlusVal) {
+        this.timeIteraPlusVal = timeIteraPlusVal;
+        return this;
+    }
+
+    public long getKeyVal() {
+        return keyVal;
+    }
+
+    public DateProcessDataObject setKeyVal(long keyVal) {
+        this.keyVal = keyVal;
+        return this;
+    }
+
+    public long getKeyValIteraVal() {
+        return keyValIteraVal;
+    }
+
+    public DateProcessDataObject setKeyValIteraVal(long keyValIteraVal) {
+        this.keyValIteraVal = keyValIteraVal;
+        return this;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public DateProcessDataObject setFormat(String format) {
+        this.format = format;
+        return this;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public DateProcessDataObject setLevel(String level) {
+        this.level = level;
+        return this;
+    }
+
+
+}