diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index ff75b0c11..f3f942d7e 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -228,7 +228,35 @@ public class BaseCfg extends BaseEntity implements Cloneable{ @ExcelField(title="do_log",dictType="DO_LOG",sort=30) protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT; + protected Integer groupId;//仅用于copy属性使用 + protected Integer regionId;//仅用于copy属性使用 + protected Integer numberRegionGroupId;//仅用于copy属性使用 + protected Integer numberRegionRegionId;//仅用于copy属性使用 + public Integer getNumberRegionGroupId() { + return numberRegionGroupId; + } + public void setNumberRegionGroupId(Integer numberRegionGroupId) { + this.numberRegionGroupId = numberRegionGroupId; + } + public Integer getNumberRegionRegionId() { + return numberRegionRegionId; + } + public void setNumberRegionRegionId(Integer numberRegionRegionId) { + this.numberRegionRegionId = numberRegionRegionId; + } + public Integer getGroupId() { + return groupId; + } + public void setGroupId(Integer groupId) { + this.groupId = groupId; + } + public Integer getRegionId() { + return regionId; + } + public void setRegionId(Integer regionId) { + this.regionId = regionId; + } public Integer getDoLog() { return doLog; } @@ -281,7 +309,7 @@ public class BaseCfg extends BaseEntity implements Cloneable{ if(!StringUtil.isEmpty(list)) { for (SysMenu menu :list) { if (!StringUtil.isEmpty(menu.getCode()) - && !StringUtil.isEmpty(menu.getFunctionId()) + &&menu.getFunctionId()!=null && menu.getFunctionId().equals(functionId) //&& menu.getFunctionId().equals(functionId) ) { diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 1279674c8..a3930c4ff 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -239,7 +239,7 @@ public class ConfigServiceUtil { * @param type,1表示maat配置取消,2表示回调配置取消 * @return */ - public static ToMaatResult delete(String params,Integer type) throws MaatConvertException{ + public static ToMaatResult delete(String params,Integer type) throws Exception{ String result = null; ToMaatResult bean = null; String url = Constants.SERVICE_URL; @@ -253,8 +253,13 @@ public class ConfigServiceUtil { logger.info("delete url:"+url); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); - Response response= header.delete(); - if( response.getStatus() == 200){ + Response response=null; + 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); @@ -286,8 +291,13 @@ public class ConfigServiceUtil { logger.info("put url:"+url); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); - Response response= header.put(Entity.entity(params, MediaType.APPLICATION_JSON)); - if( response.getStatus() == 200){ + Response response=null; + 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); @@ -346,8 +356,13 @@ public class ConfigServiceUtil { FileDataBodyPart bodyPart=new FileDataBodyPart("file",file); formDataMultiPart.bodyPart(bodyPart); Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); - Response response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); - if( response.getStatus() == 200){ + Response response=null; + 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); @@ -374,8 +389,13 @@ public class ConfigServiceUtil { logger.info("postGroupReuseSources url:"+url); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); - Response response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); - if( response.getStatus() == 200){ + Response response=null; + 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"}); @@ -425,8 +445,13 @@ public class ConfigServiceUtil { WebTarget wt = client.target(uri); logger.info("getReport url:"+uri.toString()); Builder header = wt.request(); - Response response= header.get(); - if( response.getStatus() == 200){ + Response response=null; + 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)); @@ -474,10 +499,14 @@ public class ConfigServiceUtil { Client client=ClientUtil.getClient(); WebTarget wt = client.target(uri); Builder header = wt.request(); - Response response= header.get(); - if( response.getStatus() == 200){ + Response response=null; + 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)); }