Change backend Code for VNF Performance UI page

Change-Id: I314f0ce976e6fcaaebcaf2e963ec30a727dc8a6b
Issue-ID: USECASEUI-231
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
index fb8d388..c6e63bb 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
@@ -35,53 +35,53 @@ public class PerformanceHeader implements Serializable {
        @Column(name = "version")\r
        private String version;\r
        \r
-       @Column(name = "eventName")\r
+       @Column(name = "event_name")\r
        private String eventName;\r
        \r
        @Column(name = "domain")\r
        private String domain;\r
        \r
        \r
-       @Column(name = "eventId")\r
+       @Column(name = "event_id")\r
        private String eventId;\r
        \r
-       @Column(name = "eventType")\r
+       @Column(name = "event_type")\r
        private String eventType;\r
        \r
-       @Column(name = "nfcNamingCode", nullable=false)\r
+       @Column(name = "nfc_naming_code", nullable=false)\r
        private String nfcNamingCode;\r
        \r
-       @Column(name = "nfNamingCode", nullable=false)\r
+       @Column(name = "nf_naming_code", nullable=false)\r
        private String nfNamingCode;\r
        \r
-       @Column(name = "sourceId")\r
+       @Column(name = "source_id")\r
        private String sourceId;\r
        \r
-       @Column(name = "sourceName")\r
+       @Column(name = "source_name")\r
        private String sourceName;\r
        \r
-       @Column(name = "reportingEntityId")\r
+       @Column(name = "reporting_entity_id")\r
        private String reportingEntityId;\r
        \r
-       @Column(name = "reportingEntityName")\r
+       @Column(name = "reporting_entity_name")\r
        private String reportingEntityName;\r
        \r
        @Column(name = "priority")\r
        private String priority;\r
        \r
-       @Column(name = "startEpochMicrosec")\r
+       @Column(name = "start_epoch_microsec")\r
        private String startEpochMicrosec;\r
        \r
-       @Column(name = "lastEpochMicroSec")\r
+       @Column(name = "last_epoch_microsec")\r
        private String lastEpochMicroSec;\r
        \r
        @Column(name = "sequence")\r
        private String sequence;\r
        \r
-       @Column(name = "measurementsForVfScalingVersion")\r
+       @Column(name = "measurements_for_vf_scaling_version")\r
        private String measurementsForVfScalingVersion;\r
        \r
-       @Column(name = "measurementInterval")\r
+       @Column(name = "measurement_interval")\r
        private String measurementInterval;\r
 \r
        /** */\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java
index 72626e6..e53202b 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java
@@ -20,6 +20,8 @@ import java.util.Date;
 \r
 import javax.persistence.Column;\r
 import javax.persistence.Entity;\r
+import javax.persistence.GeneratedValue;\r
+import javax.persistence.GenerationType;\r
 import javax.persistence.Id;\r
 import javax.persistence.Table;\r
 \r
@@ -29,6 +31,7 @@ import javax.persistence.Table;
 public class PerformanceInformation implements Serializable {\r
        \r
        @Id\r
+       @GeneratedValue(strategy=GenerationType.IDENTITY)\r
        @Column(name = "id")\r
        private int id;\r
        \r
@@ -38,16 +41,16 @@ public class PerformanceInformation implements Serializable {
        @Column(name = "value")\r
        private String value;\r
        \r
-       @Column(name = "sourceId")\r
+       @Column(name = "source_id")\r
        private String sourceId;\r
        \r
-       @Column(name = "startEpochMicrosec")\r
+       @Column(name = "start_epoch_microsec")\r
        private String  startEpochMicrosec;\r
        \r
-       @Column(name = "lastEpochMicroSec")\r
+       @Column(name = "last_epoch_microSec")\r
        private String lastEpochMicroSec;\r
        \r
-       @Column(name="headerId")\r
+       @Column(name="header_id")\r
        private String headerId;\r
        \r
        public PerformanceInformation() {\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java
index a1513fd..5c8a13f 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java
+++ b/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java
@@ -27,6 +27,7 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -147,4 +148,11 @@ public class UuiCommonUtil {
         File targetFile = new File(path);
         return targetFile.exists();
     }
+    
+    public static String readJsonFile(String path) throws IOException{
+
+               File file = new File(path);
+               String content= FileUtils.readFileToString(file,"UTF-8");
+               return content;
+       }
 }