From: guochuyicmri <guochuyi@chinamobile.com>
Date: Wed, 31 Oct 2018 02:31:19 +0000 (+0800)
Subject: add method:getServiceNumByCustomerId
X-Git-Tag: 1.2.1~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F71518%2F1;p=usecase-ui%2Fserver.git

add method:getServiceNumByCustomerId

Change-Id: Ifc3137dabd2efd5a1b6eba67c5def55a269d493c
Issue-ID: USECASEUI-168
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 fb911b76..79503873 100644
--- 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
@@ -97,6 +97,11 @@ public class ServiceInstanceController {
         return mapper.writeValueAsString(map);
     }
 	
+	@ResponseBody
+    @RequestMapping(value = {"/uui-lcm/serviceNumByCustomer"}, method = RequestMethod.GET , produces = "application/json")
+    public String serviceNumByCustomer(HttpServletRequest request) throws JsonProcessingException{
+		return serviceInstanceService.serviceNumByCustomer();
+	}
     @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 e9416f8f..28bd9e06 100644
--- 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
@@ -17,9 +17,13 @@ package org.onap.usecaseui.server.service.lcm;
 
 import java.util.List;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+
 public interface ServiceInstanceService {
 
     List<String> listServiceInstances(String customerId, String serviceType);
     
     String getRelationShipData(String customerId, String serviceType,String serviceId );
+    
+    String serviceNumByCustomer() 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 6405795b..b7f89593 100644
--- 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
@@ -18,7 +18,9 @@ package org.onap.usecaseui.server.service.lcm.impl;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -138,20 +140,31 @@ public class DefaultServiceInstanceService implements ServiceInstanceService {
         }
 	}
 	
-	public String serviceNumByCustomer(){
+	@Override
+	public String serviceNumByCustomer() throws JsonProcessingException{
+		Map<String,Object> result = new HashMap();
+		ObjectMapper omAlarm = new ObjectMapper();
 		List<AAICustomer> customers = customerService.listCustomer();
 		int total =0;
+		List<Map<String,Object>> list = new ArrayList<>();
 		if(customers.size()>0){
 			for(AAICustomer customer : customers){
+				Map<String,Object> customerMap = new HashMap<String,Object>();
+				int customerNum = 0;
 				List<AAIServiceSubscription> serviceSubscriptions = customerService.listServiceSubscriptions(customer.getGlobalCustomerId());
 				if(serviceSubscriptions.size()>0){
 					for(AAIServiceSubscription serviceSubscription:serviceSubscriptions){
 						List<String> serviceInstances =this.listServiceInstances(customer.getGlobalCustomerId(), serviceSubscription.getServiceType());
 						total+=serviceInstances.size();
+						customerNum+=serviceInstances.size();
 					}
 				}
+				customerMap.put(customer.getSubscriberName(), customerNum);
+				list.add(customerMap);
 			}
 		}
-		return null;
+		result.put("serviceTotalNum", total);
+		result.put("customerServiceList", list);
+		return omAlarm.writeValueAsString(result);
 	}
 }