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 getId(int type,int num) throws Exception { String result = null; String url = ""; + List 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 resMap = gson.fromJson(result,Map.class); + if(!StringUtil.isEmpty(resMap)){ + Map dataMap = (Map)resMap.get("data"); + if(!StringUtil.isEmpty(dataMap)){ + list = (List)dataMap.get("pzIdList"); + + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } }else{ throw new MaatConvertException(":"+response.readEntity(String.class)); } - return result; + return list; } /** * MAAT配置提交