Change backend Code for dashboard UI page

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

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
index 7950387..7e6d94a 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
@@ -102,6 +102,13 @@ public class ServiceInstanceController {
     public String serviceNumByCustomer(HttpServletRequest request) throws JsonProcessingException{
                return serviceInstanceService.serviceNumByCustomer();
        }
+       
+       @ResponseBody
+    @RequestMapping(value = {"/uui-lcm/serviceNumByServiceType/{customerId}"}, method = RequestMethod.GET , produces = "application/json")
+    public String serviceNumByServiceType(String customerId) throws JsonProcessingException{
+               return serviceInstanceService.serviceNumByServiceType(customerId);
+       }
+       
     @ResponseBody
     @RequestMapping(value = {"/uui-lcm/getServiceInstanceById"}, method = RequestMethod.GET , produces = "application/json")
     public String getServiceInstanceById(HttpServletRequest request){

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java
index 28bd9e0..7f5f430 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceInstanceService.java
@@ -26,4 +26,6 @@ public interface ServiceInstanceService {
     String getRelationShipData(String customerId, String serviceType,String serviceId );
     
     String serviceNumByCustomer() throws JsonProcessingException;
+    
+       String serviceNumByServiceType(String customerId) throws JsonProcessingException;
 }

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
index 8a6f7aa..92b2755 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
@@ -180,4 +180,26 @@ public class DefaultServiceInstanceService implements ServiceInstanceService {
                result.put("customerServiceList", list);
                return omAlarm.writeValueAsString(result);
        }
+       
+       @Override
+       public String serviceNumByServiceType(String customerId) throws JsonProcessingException{
+               
+               List<AAIServiceSubscription> serviceTypes = customerService.listServiceSubscriptions(customerId);
+               
+               List<Map<String,Object>> list = new ArrayList<>();
+               
+               ObjectMapper omAlarm = new ObjectMapper();
+               
+               for (AAIServiceSubscription aaiServiceSubscription : serviceTypes) {
+                       
+                       Map<String,Object> serviceTypeMap = new HashMap<String,Object>();
+                       
+                       List<String> serviceInstances =this.listServiceInstances(customerId, aaiServiceSubscription.getServiceType());
+                       
+                       serviceTypeMap.put(aaiServiceSubscription.getServiceType(),serviceInstances.size());
+                       
+                       list.add(serviceTypeMap);
+               }
+               return omAlarm.writeValueAsString(list);
+       }
 }