diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java index 1adca16c7..fcf8abc9a 100644 --- a/src/main/java/com/nis/util/ConfigConvertUtil.java +++ b/src/main/java/com/nis/util/ConfigConvertUtil.java @@ -248,7 +248,7 @@ public class ConfigConvertUtil { List regionIdList = Lists.newArrayList(); T srcCfg = srcList.get(i); BaseIpCfg baseIpCfg = new BaseIpCfg(); - BeanUtils.copyProperties(srcCfg, baseIpCfg); + BeanUtils.copyProperties(srcCfg, baseIpCfg,new String[]{"menuNameCode"}); regionIdList.add(baseIpCfg.getRegionId()); IpCfg cfg = new IpCfg(); BeanUtils.copyProperties(baseIpCfg, cfg); @@ -325,10 +325,10 @@ public class ConfigConvertUtil { } else if (cfgType == 4) { for (int i = 0; i < srcList.size(); i++) { BaseCfg baseCfg = new BaseCfg(); - BeanUtils.copyProperties(srcList.get(i), baseCfg);//拷贝公共属性 + BeanUtils.copyProperties(srcList.get(i), baseCfg,new String[]{"menuNameCode"});//拷贝公共属性 // 一条业务配置创建一个分组 com.nis.domain.maat.MaatCfg.NumBoundaryCfg cfg = new com.nis.domain.maat.MaatCfg.NumBoundaryCfg(); - BeanUtils.copyProperties(srcList.get(i), cfg); + BeanUtils.copyProperties(srcList.get(i), cfg,new String[]{"menuNameCode"}); GroupCfg group = new GroupCfg(); group.setGroupId(baseCfg.getGroupId()); group.setCompileId(baseCfg.getCompileId()); @@ -344,10 +344,10 @@ public class ConfigConvertUtil { } else if (cfgType == 5) { for (int i = 0; i < srcList.size(); i++) { BaseCfg baseCfg = new BaseCfg(); - BeanUtils.copyProperties(srcList.get(i), baseCfg);//拷贝公共属性 + BeanUtils.copyProperties(srcList.get(i), baseCfg,new String[]{"menuNameCode"});//拷贝公共属性 // 一条业务配置创建一个分组 com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg(); - BeanUtils.copyProperties(srcList.get(i), cfg); + BeanUtils.copyProperties(srcList.get(i), cfg,new String[]{"menuNameCode"}); GroupCfg group = new GroupCfg(); group.setGroupId(baseCfg.getGroupId()); group.setCompileId(baseCfg.getCompileId()); diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java index 57ee63f4d..e1578cd6f 100644 --- a/src/main/java/com/nis/util/SchedulerTaskUtil.java +++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java @@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import com.google.common.collect.Lists; +import com.google.gson.Gson; import com.nis.domain.basics.AsnIpCfg; import com.nis.domain.callback.InlineIp; import com.nis.domain.configuration.AppPolicyCfg; @@ -384,8 +385,8 @@ public class SchedulerTaskUtil { } } //批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号),分组复用的域配置不需要重新获取regionId,groupId - List regionIds = ConfigServiceUtil.getId(3, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size()); - List groupIds = ConfigServiceUtil.getId(2, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size()); + List regionIds = ConfigServiceUtil.getId(3, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size()+list.size()); + List groupIds = ConfigServiceUtil.getId(2, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size()+list.size()); entity.setIsValid(isValid);//将最新的配置状态赋给配置对象 entity.setAuditTime(updateTime); for(int i=0;i list1 = new ArrayList(); String userRegion = ""; - //处理自定义域 + //处理自定义域【DDOS自定义域组成json结构】 + Map ddosUserRegion= new HashMap(); if(userRegionList!=null){ for(Map n:userRegionList){ Object userRegionPosition = n.get("userRegionPosition"); @@ -421,17 +423,23 @@ public class SchedulerTaskUtil { Field field = aClass.getDeclaredField(regionColumn); field.setAccessible(true); value = field.get(cfg); + if(!StringUtil.isEmpty(value)){ if(StringUtil.isEmpty(n.get("regionKey"))){ userRegion = value.toString(); }else{ - userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT; + //userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT; + ddosUserRegion.put(n.get("regionKey"), value); } + }else{ + ddosUserRegion.put(n.get("regionKey"), ""); } } } if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){ userRegion = userRegion.substring(0, userRegion.length()-1); + }else if(!StringUtil.isEmpty(ddosUserRegion)){ + userRegion = new Gson().toJson(ddosUserRegion); } } list1.add(cfg); diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 72d9d86ba..be3565b2d 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -1324,6 +1324,8 @@ public class ConfigSynchronizationService extends BaseService{ //userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT; ddosUserRegion.put(n.get("regionKey"), value); } + }else{ + ddosUserRegion.put(n.get("regionKey"), ""); } } }