From 7eaf6d65087a007bdf83885495c9e098b9c75899 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 19 Jul 2018 14:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=85=8D=E7=BD=AE=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=80=BB=E6=95=B0=E8=B0=83=E6=95=B4=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E9=80=A0=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/ConfigServiceUtil.java  | 27 ++++++++++---------
 .../report/NtcPzReportController.java         | 19 ++++++-------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java
index e39184240..46e273925 100644
--- a/src/main/java/com/nis/util/ConfigServiceUtil.java
+++ b/src/main/java/com/nis/util/ConfigServiceUtil.java
@@ -1,14 +1,17 @@
 package com.nis.util;
 
 import java.io.File;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
 
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
@@ -322,19 +325,19 @@ public class ConfigServiceUtil {
 		}
 		String result = null;
 		ReportResult<NtcPzReport> bean = null;
-		StringBuffer url=new StringBuffer(Constants.SERVICE_URL+Constants.NTC_PZ_REPORT+"?");
-		url.append("searchBusinessType=").append(type)
-		.append("&searchService=").append(serviceIds).append("&searchCfgId=").append(ids);
-		if(StringUtils.isNotBlank(searchReportStartTime)){
-			url.append("&searchReportStartTime=").append(searchReportStartTime);
-		}
-		if(StringUtils.isNotBlank(searchReportEndTime)){
-			url.append("&searchReportEndTime=").append(searchReportEndTime);
-		}
+		UriBuilder builder=UriBuilder.fromPath(Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT);
+		builder.queryParam("searchBusinessType",type);
+		builder.queryParam("searchService",serviceIds);
+		builder.queryParam("searchCfgId",ids);
+//		builder.queryParam("searchReportStartTime",searchReportStartTime);
+//		builder.queryParam("searchReportEndTime",searchReportEndTime);
+		URI uri=builder.build();
 		//创建连接
-		WebTarget wt = ClientUtil.getWebTarger(url.toString());
-		logger.info("getReport url:"+url);
-		Builder header = wt.request(MediaType.APPLICATION_JSON);
+		ClientUtil.initClient();
+		Client client=ClientUtil.getClient();
+		WebTarget wt = client.target(uri);
+		logger.info("getReport url:"+uri.toString());
+		Builder header = wt.request();
 		Response response= header.get(); 
 		if( response.getStatus() == 200){
 			result= response.readEntity(String.class);
diff --git a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
index 76718c291..d2c2390e6 100644
--- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
@@ -32,6 +32,7 @@ import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.log.SearchReport;
 import com.nis.domain.report.NtcPzReport;
 import com.nis.domain.report.ReportResult;
+import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.web.controller.BaseController;
@@ -62,18 +63,14 @@ public class NtcPzReportController extends BaseController{
 				break;
 			}
 		}
-//		ReportResultLog result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
-//		if(result.getData()!=null&&result.getData().getList()!=null){
-//			model.addAttribute("data", result.getData().getList());
-//		}
 		data.put("compileId", compileId.intValue());
-		data.put("sum", 1000l);
-//		try {
-//			Thread.sleep(10000);
-//		} catch (InterruptedException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
+		ReportResult<NtcPzReport> result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
+		if(result.getData()!=null&&result.getData().getList()!=null&&result.getData().getList().size()>0){
+			data.put("sum", result.getData().getList().get(0).getSum().longValue());
+		}else {
+			data.put("sum", 0);
+		}
+		
 		return data;
 	}
 	@RequestMapping("/ntcPzReport")