Change backend Code for LCM UI page of service creation

Change-Id: I41d1a2db2ed1e9af41d74c663c00417386887179
Issue-ID: USECASEUI-221
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 e217fe7..63bce43 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
@@ -29,6 +29,7 @@ import javax.annotation.Resource;
 \r
 import org.onap.usecaseui.server.bean.AlarmsHeader;\r
 import org.onap.usecaseui.server.bean.AlarmsInformation;\r
+import org.onap.usecaseui.server.bean.SortMaster;\r
 import org.onap.usecaseui.server.constant.Constant;\r
 import org.onap.usecaseui.server.service.AlarmsHeaderService;\r
 import org.onap.usecaseui.server.service.AlarmsInformationService;\r
@@ -274,4 +275,14 @@ public class AlarmController
         String string =omAlarm.writeValueAsString(map);\r
         return string;\r
     }\r
+    \r
+    @RequestMapping(value="/listSortMasters",method=RequestMethod.GET,produces = "application/json")\r
+    public String getSortMasterInfo() throws JsonProcessingException{\r
+       Map<String,List<SortMaster>> map = new HashMap<>();\r
+       List<SortMaster> operationTypes = alarmsHeaderService.listSortMasters("operationType");\r
+       List<SortMaster> operationResults = alarmsHeaderService.listSortMasters("operationResult");\r
+       map.put("operationTypes", operationTypes);\r
+       map.put("operationResults", operationResults);\r
+       return omAlarm.writeValueAsString(map);\r
+    }\r
 }\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java b/server/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java
index 570a563..363e8b3 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/AlarmsHeaderService.java
@@ -20,6 +20,7 @@ import java.sql.Timestamp;
 import java.util.List;
 
 import org.onap.usecaseui.server.bean.AlarmsHeader;
+import org.onap.usecaseui.server.bean.SortMaster;
 import org.onap.usecaseui.server.util.Page;
 
 public interface AlarmsHeaderService {
@@ -61,4 +62,6 @@ public interface AlarmsHeaderService {
       * @return
      */
     AlarmsHeader getAlarmsHeaderById(String id);
+    
+    List<SortMaster> listSortMasters(String sortType);
 }

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
index 0f9431b..0bcba4d 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
@@ -18,6 +18,8 @@ package org.onap.usecaseui.server.service.impl;
 \r
 import java.sql.Timestamp;\r
 import java.util.ArrayList;\r
+import java.util.Collection;\r
+import java.util.Collections;\r
 import java.util.List;\r
 \r
 import javax.transaction.Transactional;\r
@@ -27,6 +29,8 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;\r
 import org.hibernate.Transaction;\r
 import org.onap.usecaseui.server.bean.AlarmsHeader;\r
+import org.onap.usecaseui.server.bean.AlarmsInformation;\r
+import org.onap.usecaseui.server.bean.SortMaster;\r
 import org.onap.usecaseui.server.service.AlarmsHeaderService;\r
 import org.onap.usecaseui.server.util.Page;\r
 import org.onap.usecaseui.server.util.UuiCommonUtil;\r
@@ -254,4 +258,19 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        return null;\r
                }\r
        }\r
+\r
+       @Override\r
+       public List<SortMaster> listSortMasters(String sortType) {\r
+               \r
+               try(Session session = getSession()){\r
+                       StringBuffer hql =new StringBuffer("from SortMaster a where 1=1 and a.sortType=:sortType");\r
+                       Query query = session.createQuery(hql.toString());\r
+                       query.setString("sortType",sortType);\r
+                       List<SortMaster> list= query.list();\r
+                       return list;\r
+               } catch (Exception e) {\r
+                       logger.error("exception occurred while performing AlarmsInformationServiceImpl listSortMasters. Details:" + e.getMessage());\r
+                       return Collections.emptyList();\r
+               }\r
+       }\r
 }\r

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java
index f2958d4..8c63062 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java
@@ -19,6 +19,8 @@ import org.junit.Test;
 import org.junit.Before;
 import org.junit.After;
 import org.onap.usecaseui.server.bean.PerformanceHeader;
+import org.onap.usecaseui.server.service.impl.PerformanceHeaderServiceImpl;
+import org.onap.usecaseui.server.util.DateUtils;
 
 import java.util.*;
 import java.io.*;
@@ -83,7 +85,7 @@ public class PerformanceHeaderServiceImplTest {
                        }
                        @Mock
                        public List<PerformanceHeader> list() {
-                               PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                               PerformanceHeader ph = new PerformanceHeader();
                                return Arrays.asList(ph);
                        }
                        @Mock
@@ -137,7 +139,7 @@ public class PerformanceHeaderServiceImplTest {
        public void testSavePerformanceHeader() throws Exception {
                try {
                        PerformanceHeader ph = null;
-                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader();
                        performanceHeaderServiceImpl.savePerformanceHeader(ph);
                        performanceHeaderServiceImpl.savePerformanceHeader(phNew);
                } catch (Exception e) {
@@ -149,7 +151,7 @@ public class PerformanceHeaderServiceImplTest {
        public void testUpdatePerformanceHeader() throws Exception {
                try {
                        PerformanceHeader ph = null;
-                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader();
                        performanceHeaderServiceImpl.updatePerformanceHeader(ph);
                        performanceHeaderServiceImpl.updatePerformanceHeader(phNew);
                } catch (Exception e) {
@@ -166,7 +168,7 @@ public class PerformanceHeaderServiceImplTest {
                        }
                };
                try {
-                       PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                       PerformanceHeader ph = new PerformanceHeader();
                        ph.setVersion("");
                        ph.setEventName("");
                        ph.setDomain("");
@@ -188,7 +190,7 @@ public class PerformanceHeaderServiceImplTest {
                        ph.setLastEpochMicroSec("");;
                        performanceHeaderServiceImpl.getAllCount(ph, 1, 1);
                        
-                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader();
                        performanceHeaderServiceImpl.getAllCount(phNew, 1, 1);
                        performanceHeaderServiceImpl.getAllCount(null, 1, 1);
                } catch (Exception e) {
@@ -199,7 +201,7 @@ public class PerformanceHeaderServiceImplTest {
        @Test
        public void testQueryPerformanceHeader() throws Exception {
                try {
-                       PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                       PerformanceHeader ph = new PerformanceHeader();
                        ph.setVersion("");
                        ph.setEventName("");
                        ph.setDomain("");
@@ -221,7 +223,7 @@ public class PerformanceHeaderServiceImplTest {
                        ph.setLastEpochMicroSec("");;
                        performanceHeaderServiceImpl.queryPerformanceHeader(ph, 1, 10);
                        
-                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader();
                        performanceHeaderServiceImpl.queryPerformanceHeader(phNew, 1, 1);
                        performanceHeaderServiceImpl.queryPerformanceHeader(null, 1, 1);
                } catch (Exception e) {