From e39cecd48f407ec42deb7788bf691a0040626dcd Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Wed, 23 May 2018 14:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3ID=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=94=B1=E5=BA=94=E7=AD=94=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E6=94=B9=E4=B8=BAid=20list.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/ConfigServiceUtil.java  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java
index fab4495c2..975ada4fc 100644
--- a/src/main/java/com/nis/util/ConfigServiceUtil.java
+++ b/src/main/java/com/nis/util/ConfigServiceUtil.java
@@ -1,6 +1,8 @@
 package com.nis.util;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import javax.ws.rs.client.Invocation.Builder;
@@ -14,6 +16,8 @@ import net.sf.json.JSONObject;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.httpclient.ClientUtil;
 
@@ -23,9 +27,10 @@ public class ConfigServiceUtil {
 	 * @param type 1是compileid,2是groupid,3是regionid
 	 * @return
 	 */
-	public static String getId(int type,int num) throws Exception {
+	public static List<Integer> getId(int type,int num) throws Exception {
 		String result = null;
 		String url = "";
+		List<Integer> list = new ArrayList();
 		if (type == 1) {
 			url = Constants.SERVICE_URL+Constants.CONFIG_ID_SOURCES+"?sourceName=CONFIG_COMPILE&num="+num;
 		} else if (type == 2) {
@@ -40,10 +45,25 @@ public class ConfigServiceUtil {
 		Response response= header.get(); 
 		if( response.getStatus() == 200){
 			result= response.readEntity(String.class);
+			Gson gson=new GsonBuilder().disableHtmlEscaping()
+					.excludeFieldsWithoutExposeAnnotation()
+					.create();
+			Map<String, Object> resMap = gson.fromJson(result,Map.class);
+			if(!StringUtil.isEmpty(resMap)){
+				Map<String, Object> dataMap = (Map<String, Object>)resMap.get("data");
+				if(!StringUtil.isEmpty(dataMap)){
+					list = (List<Integer>)dataMap.get("pzIdList");
+					
+				}else{
+					throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
+				}
+			}else{
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
+			}
 		}else{
 			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
 		}
-		return result;
+		return list;
 	}
 	/**
 	 * MAAT配置提交