diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index ec3fff916..1fa78302e 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -104,147 +104,140 @@ public class ConfigServiceUtil { * @return */ public static List getId(int type,int num) throws MaatConvertException { - logger.warn("get ids start"); - long start=System.currentTimeMillis(); - 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) { - url = Constants.SERVICE_URL+Constants.CONFIG_ID_SOURCES+"?sourceName=CONFIG_GROUP&num="+num; - } else if (type == 3) { - url = Constants.SERVICE_URL+Constants.CONFIG_ID_SOURCES+"?sourceName=CONFIG_REGION&num="+num; - } - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("getId url:"+url); - //获取响应结果 - Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); Response response=null; + List list = new ArrayList(); try { - response= header.get(); - } catch (Exception e) { - if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response != null && response.getStatus() == 200){ - logger.info("get result success"); - result= response.readEntity(String.class); -// result = "{\"status\":200,\"businessCode\":2000,\"reason\":\"数据获取操作成功\"," -// + "\"msg\":\"配置ID获取成功\",\"fromuri\":\"/galaxy/service/cfg/v1/configPzIdSources\"," -// + "\"traceCode\":\"2018052409232108368751\",\"data\":{\"sourceName\":\"CONFIG_COMPILE\",\"num\":1,\"pzIdList\":[22]}}"; - JSONObject resObject = JSONObject.fromObject(result); - ToMaatResult bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - if(!StringUtil.isEmpty(bean)){ - if(!StringUtil.isEmpty(bean.getData())){ - list = bean.getData().getPzIdList(); + logger.warn("get ids start"); + long start=System.currentTimeMillis(); + String result = null; + String url = ""; + if (type == 1) { + url = Constants.SERVICE_URL+Constants.CONFIG_ID_SOURCES+"?sourceName=CONFIG_COMPILE&num="+num; + } else if (type == 2) { + url = Constants.SERVICE_URL+Constants.CONFIG_ID_SOURCES+"?sourceName=CONFIG_GROUP&num="+num; + } else if (type == 3) { + url = Constants.SERVICE_URL+Constants.CONFIG_ID_SOURCES+"?sourceName=CONFIG_REGION&num="+num; + } + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("getId url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + try { + response= header.get(); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response != null && response.getStatus() == 200){ + logger.info("get result success"); + result= response.readEntity(String.class); +// result = "{\"status\":200,\"businessCode\":2000,\"reason\":\"数据获取操作成功\"," +// + "\"msg\":\"配置ID获取成功\",\"fromuri\":\"/galaxy/service/cfg/v1/configPzIdSources\"," +// + "\"traceCode\":\"2018052409232108368751\",\"data\":{\"sourceName\":\"CONFIG_COMPILE\",\"num\":1,\"pzIdList\":[22]}}"; + JSONObject resObject = JSONObject.fromObject(result); + ToMaatResult bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + if(!StringUtil.isEmpty(bean)){ + if(!StringUtil.isEmpty(bean.getData())){ + list = bean.getData().getPzIdList(); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } }else{ - if (response != null) { - response.close(); - } throw new MaatConvertException(":"+response.readEntity(String.class)); } }else{ - if (response != null) { - response.close(); - } throw new MaatConvertException(":"+response.readEntity(String.class)); } - }else{ + long end=System.currentTimeMillis(); + logger.warn("get ids finish,cost:"+(end-start)); + } catch (Exception e) { + throw e; + }finally { if (response != null) { response.close(); } - throw new MaatConvertException(":"+response.readEntity(String.class)); - } - if (response != null) { - response.close(); - } - long end=System.currentTimeMillis(); - logger.warn("get ids finish,cost:"+(end-start)); + } return list; } /** * MAAT配置提交 * @param params * @return - * @throws Exception + * @throws MaatConvertException */ public static ToMaatResult postMaatCfg(String params) throws MaatConvertException{ - String result = null; - ToMaatResult bean = null; - String url = Constants.SERVICE_URL+Constants.MAAT_CFG; - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("postMaatCfg url:"+url); - //获取响应结果 - Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); Response response=null; + ToMaatResult bean = null; try { - response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + response.close(); + String result = null; + String url = Constants.SERVICE_URL+Constants.MAAT_CFG; + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("postMaatCfg url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + try { + response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response != null && response.getStatus() == 200){ + logger.info("get result success"); + result= response.readEntity(String.class); + JsonConfig config=new JsonConfig(); + config.setExcludes(new String[]{"configCompileList"}); + JSONObject resObject = JSONObject.fromObject(result,config); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + }finally { if (response != null) { response.close(); } - throw new MaatConvertException(""); - } - if(response != null && response.getStatus() == 200){ - logger.info("get result success"); - result= response.readEntity(String.class); - JsonConfig config=new JsonConfig(); - config.setExcludes(new String[]{"configCompileList"}); - JSONObject resObject = JSONObject.fromObject(result,config); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); - } - if (response != null) { - response.close(); - } + } + return bean; } /** * 回调配置提交 * @param params * @return - * @throws Exception + * @throws MaatConvertException */ public static ToMaatResult postCallbackCfg(String params) throws MaatConvertException{ - String result = null; - ToMaatResult bean = null; - String url = Constants.SERVICE_URL+Constants.CALLBACK_CFG; - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("postCallbackCfg url:"+url); - //获取响应结果 - Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); Response response=null; + ToMaatResult bean = null; try { - response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + String result = null; + String url = Constants.SERVICE_URL+Constants.CALLBACK_CFG; + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("postCallbackCfg url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + try { + response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response != null && response.getStatus() == 200){ + result= response.readEntity(String.class); + JSONObject resObject = JSONObject.fromObject(result); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + }finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response != null && response.getStatus() == 200){ - result= response.readEntity(String.class); - JSONObject resObject = JSONObject.fromObject(result); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } return bean; } @@ -252,41 +245,40 @@ public class ConfigServiceUtil { * 文件配置提交 * @param params * @return - * @throws Exception + * @throws MaatConvertException */ - public static ToMaatResult postFileCfg(String params,File file,String fileDesc) throws Exception{ - String result = null; - ToMaatResult bean = null; - String url = Constants.SERVICE_URL+Constants.FILE_UPLOAD_CFG; - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("postFileCfg url:"+url); - FormDataMultiPart formDataMultiPart=new FormDataMultiPart(); - FileDataBodyPart bodyPart=new FileDataBodyPart("file",file); - formDataMultiPart.bodyPart(bodyPart); - Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); + public static ToMaatResult postFileCfg(String params,File file,String fileDesc) throws MaatConvertException{ Response response=null; + ToMaatResult bean = null; try { - response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + String result = null; + String url = Constants.SERVICE_URL+Constants.FILE_UPLOAD_CFG; + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("postFileCfg url:"+url); + FormDataMultiPart formDataMultiPart=new FormDataMultiPart(); + FileDataBodyPart bodyPart=new FileDataBodyPart("file",file); + formDataMultiPart.bodyPart(bodyPart); + Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); + try { + response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response != null && response.getStatus() == 200){ + result= response.readEntity(String.class); + JSONObject resObject = JSONObject.fromObject(result); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(""); + } } catch (Exception e) { + throw e; + } finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response != null && response.getStatus() == 200){ - result= response.readEntity(String.class); - JSONObject resObject = JSONObject.fromObject(result); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(""); + response.close(); + } } - if (response != null) { - response.close(); - } return bean; } @@ -296,42 +288,41 @@ public class ConfigServiceUtil { * @param type,1表示maat配置取消,2表示回调配置取消 * @return */ - public static ToMaatResult delete(String params,Integer type) throws Exception{ - String result = null; - ToMaatResult bean = null; - String url = Constants.SERVICE_URL; - if(type==1){ - url = url+Constants.MAAT_CFG; - }else if(type==2){ - url = url+Constants.CALLBACK_CFG; - } - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("delete url:"+url); - //获取响应结果 - Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + public static ToMaatResult delete(String params,Integer type) throws MaatConvertException{ Response response=null; + ToMaatResult bean = null; try { - response= header.delete(); + String result = null; + String url = Constants.SERVICE_URL; + if(type==1){ + url = url+Constants.MAAT_CFG; + }else if(type==2){ + url = url+Constants.CALLBACK_CFG; + } + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("delete url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + try { + response= header.delete(); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response != null && response.getStatus() == 200){ + result= response.readEntity(String.class); + JSONObject resObject = JSONObject.fromObject(result); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + } finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response != null && response.getStatus() == 200){ - result= response.readEntity(String.class); - JSONObject resObject = JSONObject.fromObject(result); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } return bean; } @@ -342,43 +333,42 @@ public class ConfigServiceUtil { * @return */ public static ToMaatResult put(String params,Integer type) throws MaatConvertException{ - String result = null; ToMaatResult bean = null; - String url = Constants.SERVICE_URL; - if(type==1){ - url = url+Constants.MAAT_CFG; - }else if(type==2){ - url = url+Constants.CALLBACK_CFG; - }else if(type==3) { - url = url+Constants.GROUP_REUSE_SOURCES; - } - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("put url:"+url); - //获取响应结果 - Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); Response response=null; try { - response= header.put(Entity.entity(params, MediaType.APPLICATION_JSON)); + String result = null; + String url = Constants.SERVICE_URL; + if(type==1){ + url = url+Constants.MAAT_CFG; + }else if(type==2){ + url = url+Constants.CALLBACK_CFG; + }else if(type==3) { + url = url+Constants.GROUP_REUSE_SOURCES; + } + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("put url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + try { + response= header.put(Entity.entity(params, MediaType.APPLICATION_JSON)); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response !=null && response.getStatus() == 200){ + result= response.readEntity(String.class); + JSONObject resObject = JSONObject.fromObject(result); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + }finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); - JSONObject resObject = JSONObject.fromObject(result); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } return bean; } /** @@ -389,27 +379,27 @@ public class ConfigServiceUtil { */ public static String patch(String params,Integer type) throws MaatConvertException{ String result = null; - ToMaatResult bean = null; - String url = Constants.SERVICE_URL; - if(type==1){ - url = url+Constants.MAAT_CFG; - }else if(type==2){ - url = url+Constants.CALLBACK_CFG; - }else if(type==3) { - url = url+Constants.GROUP_REUSE_SOURCES; - } - logger.info("put url:"+url); - //创建连接 try { - ClientUtil.initClient(); - Client client=ClientUtil.getClient(); - result = HttpClientUtil.patch(url, params); -// JSONObject resObject = JSONObject.fromObject(result); -// bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - //获取响应结果 + String url = Constants.SERVICE_URL; + if(type==1){ + url = url+Constants.MAAT_CFG; + }else if(type==2){ + url = url+Constants.CALLBACK_CFG; + }else if(type==3) { + url = url+Constants.GROUP_REUSE_SOURCES; + } + logger.info("put url:"+url); + //创建连接 + try { + result = HttpClientUtil.patch(url, params); +// JSONObject resObject = JSONObject.fromObject(result); +// bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + //获取响应结果 + } catch (Exception e) { + throw new MaatConvertException(":"+result); + } } catch (Exception e) { - e.printStackTrace(); - throw new MaatConvertException(":"+result); + throw e; } return result; @@ -418,42 +408,41 @@ public class ConfigServiceUtil { * 信息获取 * @param params * @return - * @throws Exception + * @throws MaatConvertException */ public static ToMaatResult getFileDigest(String params,File file,String fileDesc) throws MaatConvertException{ - String result = null; ToMaatResult bean = null; - String url = Constants.SERVICE_URL+Constants.FILE_DIGEST_CFG; - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("getFileDigest url:"+url); - FormDataMultiPart formDataMultiPart=new FormDataMultiPart(); - FileDataBodyPart bodyPart=new FileDataBodyPart("file",file); - formDataMultiPart.bodyPart(bodyPart); - Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); Response response=null; try { - response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + String result = null; + String url = Constants.SERVICE_URL+Constants.FILE_DIGEST_CFG; + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("getFileDigest url:"+url); + FormDataMultiPart formDataMultiPart=new FormDataMultiPart(); + FileDataBodyPart bodyPart=new FileDataBodyPart("file",file); + formDataMultiPart.bodyPart(bodyPart); + Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); + try { + response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response !=null && response.getStatus() == 200){ + result= response.readEntity(String.class); + logger.info("获取文件摘要响应结果"+result); + JSONObject resObject = JSONObject.fromObject(result); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + } finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); - logger.info("获取文件摘要响应结果"+result); - JSONObject resObject = JSONObject.fromObject(result); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } return bean; } /** @@ -463,42 +452,41 @@ public class ConfigServiceUtil { * @throws MaatConvertException */ public static ToMaatResult postGroupReuseSources(String params) throws MaatConvertException{ - logger.warn("postGroupReuseSources start"); - long start=System.currentTimeMillis(); - String result = null; ToMaatResult bean = null; - String url = Constants.SERVICE_URL+Constants.GROUP_REUSE_SOURCES; - //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("postGroupReuseSources url:"+url); - //获取响应结果 - Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); Response response=null; try { - response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + logger.warn("postGroupReuseSources start"); + long start=System.currentTimeMillis(); + String result = null; + String url = Constants.SERVICE_URL+Constants.GROUP_REUSE_SOURCES; + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("postGroupReuseSources url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + try { + response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response !=null && response.getStatus() == 200){ + result= response.readEntity(String.class); + JsonConfig config=new JsonConfig(); + config.setExcludes(new String[]{"configCompileList"}); + JSONObject resObject = JSONObject.fromObject(result,config); + bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } + long end=System.currentTimeMillis(); + logger.warn("postGroupReuseSources end,cost:"+(end-start)); } catch (Exception e) { + throw e; + } finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); - JsonConfig config=new JsonConfig(); - config.setExcludes(new String[]{"configCompileList"}); - JSONObject resObject = JSONObject.fromObject(result,config); - bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } - long end=System.currentTimeMillis(); - logger.warn("postGroupReuseSources end,cost:"+(end-start)); return bean; } /** @@ -517,110 +505,108 @@ public class ConfigServiceUtil { * @since 1.0.0 */ public static String getReport(int type,String ids,String serviceIds,String searchReportStartTime,String searchReportEndTime) throws MaatConvertException{ - if(StringUtils.isBlank(ids)||StringUtils.isBlank(serviceIds)){ - throw new MaatConvertException(""); - } String result = null; - UriBuilder builder=UriBuilder.fromPath(Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT); - builder.queryParam("searchBusinessType",type); - builder.queryParam("searchService",serviceIds); - builder.queryParam("searchCfgId",ids); - if(StringUtils.isNotBlank(searchReportStartTime)) { - builder.queryParam("searchReportStartTime",searchReportStartTime); - } - if(StringUtils.isNotBlank(searchReportEndTime)) { - builder.queryParam("searchReportEndTime",searchReportEndTime); - } - URI uri=builder.build(); - //创建连接 - ClientUtil.initClient(); - Client client=ClientUtil.getClient(); - WebTarget wt = client.target(uri); - logger.info("getReport url:"+uri.toString()); - Builder header = wt.request(); Response response=null; try { - response= header.get(); + if(StringUtils.isBlank(ids)||StringUtils.isBlank(serviceIds)){ + throw new MaatConvertException(""); + } + UriBuilder builder=UriBuilder.fromPath(Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT); + builder.queryParam("searchBusinessType",type); + builder.queryParam("searchService",serviceIds); + builder.queryParam("searchCfgId",ids); + if(StringUtils.isNotBlank(searchReportStartTime)) { + builder.queryParam("searchReportStartTime",searchReportStartTime); + } + if(StringUtils.isNotBlank(searchReportEndTime)) { + builder.queryParam("searchReportEndTime",searchReportEndTime); + } + URI uri=builder.build(); + //创建连接 + ClientUtil.initClient(); + Client client=ClientUtil.getClient(); + WebTarget wt = client.target(uri); + logger.info("getReport url:"+uri.toString()); + Builder header = wt.request(); + try { + response= header.get(); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response !=null && response.getStatus() == 200){ + result= response.readEntity(String.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + } finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } return result; } - public static String getReport(String reportUrl, SearchReport searchCondition) throws MaatConvertException, UnsupportedEncodingException{ + public static String getReport(String reportUrl, SearchReport searchCondition) throws MaatConvertException{ // if(StringUtils.isBlank(searchCondition.getSearchService())){ // throw new MaatConvertException(""); // } - String result = null; - UriBuilder builder=UriBuilder.fromPath(reportUrl); - builder.queryParam("searchBusinessType",searchCondition.getSearchBusinessType()); - if(StringUtils.isNotBlank(searchCondition.getSearchService())) { - builder.queryParam("searchService",searchCondition.getSearchService()); - } - if(searchCondition.getSearchCondition()!=null){ - for(Entry e:searchCondition.getSearchCondition().entrySet()){ - builder.queryParam(e.getKey(),e.getValue()); - } - - } - if(StringUtils.isNotBlank(searchCondition.getSearchReportStartTime())){ - builder.queryParam("searchReportStartTime",searchCondition.getSearchReportStartTime()); - } - if(StringUtils.isNotBlank(searchCondition.getSearchReportEndTime())){ - builder.queryParam("searchReportEndTime",searchCondition.getSearchReportEndTime()); - } - if(searchCondition.getPageNo()!=null){ - builder.queryParam("pageNo",searchCondition.getPageNo()); - } - if(searchCondition.getPageSize()!=null){ - builder.queryParam("pageSize",searchCondition.getPageSize()); - } - if(StringUtils.isNotBlank(searchCondition.getOrderBy())){ - builder.queryParam("orderBy",searchCondition.getOrderBy()); - } - if(StringUtils.isNotBlank(searchCondition.getFields())){ - builder.queryParam("fields",searchCondition.getFields()); - } - URI uri=builder.build(); - logger.info("report url:"+uri.toString()); - //创建连接 - ClientUtil.initClient(); - Client client=ClientUtil.getClient(); - WebTarget wt = client.target(uri); - Builder header = wt.request(); Response response=null; + String result = null; try { - response= header.get(); + UriBuilder builder=UriBuilder.fromPath(reportUrl); + builder.queryParam("searchBusinessType",searchCondition.getSearchBusinessType()); + if(StringUtils.isNotBlank(searchCondition.getSearchService())) { + builder.queryParam("searchService",searchCondition.getSearchService()); + } + if(searchCondition.getSearchCondition()!=null){ + for(Entry e:searchCondition.getSearchCondition().entrySet()){ + builder.queryParam(e.getKey(),e.getValue()); + } + + } + if(StringUtils.isNotBlank(searchCondition.getSearchReportStartTime())){ + builder.queryParam("searchReportStartTime",searchCondition.getSearchReportStartTime()); + } + if(StringUtils.isNotBlank(searchCondition.getSearchReportEndTime())){ + builder.queryParam("searchReportEndTime",searchCondition.getSearchReportEndTime()); + } + if(searchCondition.getPageNo()!=null){ + builder.queryParam("pageNo",searchCondition.getPageNo()); + } + if(searchCondition.getPageSize()!=null){ + builder.queryParam("pageSize",searchCondition.getPageSize()); + } + if(StringUtils.isNotBlank(searchCondition.getOrderBy())){ + builder.queryParam("orderBy",searchCondition.getOrderBy()); + } + if(StringUtils.isNotBlank(searchCondition.getFields())){ + builder.queryParam("fields",searchCondition.getFields()); + } + URI uri=builder.build(); + logger.info("report url:"+uri.toString()); + //创建连接 + ClientUtil.initClient(); + Client client=ClientUtil.getClient(); + WebTarget wt = client.target(uri); + Builder header = wt.request(); + try { + response= header.get(); + } catch (Exception e) { + throw new MaatConvertException(""); + } + if(response !=null && response.getStatus() == 200){ + result= response.readEntity(String.class); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } } catch (Exception e) { + throw e; + } finally { if (response != null) { - response.close(); - } - throw new MaatConvertException(""); - } - if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); - }else{ - if (response != null) { - response.close(); - } - throw new MaatConvertException(":"+response.readEntity(String.class)); + response.close(); + } } - if (response != null) { - response.close(); - } return result; } public static void main(String[] args) { diff --git a/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java b/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java index 66d95018d..8a2bb006f 100644 --- a/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java +++ b/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java @@ -60,6 +60,7 @@ public class ConfigureStatisticsController extends BaseController{ //2、根据来函分页 RequestInfo requestInfo=new RequestInfo(); requestInfo.setIsAudit(1); + requestInfo.setIsValid(1); Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo); List requestInfos=requestPage.getList(); //3、根据当前页的requestInfo信息查询request统计信息 diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 627cfddf2..49b88a069 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -563,25 +563,6 @@
- - -
-
- -
- -
-
-
-
-
@@ -661,7 +642,7 @@ <%-- action 为128 白名单时 --%>
-
+ --%>