diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index b2422d03a..07d4bd7ca 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -372,6 +372,7 @@ public abstract class BaseService { if(cfgType==1){ List numRegionList = new ArrayList(); Integer groupId = 0; + Integer numGroupId = 0; for(T srcCfg:srcList){ BaseIpCfg baseIpCfg = new BaseIpCfg(); BeanUtils.copyProperties(srcCfg, baseIpCfg); @@ -398,40 +399,45 @@ public abstract class BaseService { } dstList.addAll(cfgs); - //如果protocolId非空非零,需要构造数值型域配置 - if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0){ - GroupCfg group1 = new GroupCfg(); - group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); - group1.setCompileId(baseIpCfg.getCompileId()); - group1.setAuditTime(baseCfg.getAuditTime()); - group1.setIsValid(baseCfg.getIsValid()); - groupRelationList.add(group1); - NumBoundaryCfg numCfg = new NumBoundaryCfg(); - numCfg.initDefaultValue(); - numCfg.setLowBoundary(baseIpCfg.getProtocolId()); - numCfg.setUpBoundary(baseIpCfg.getProtocolId()); - numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); - numCfg.setAuditTime(baseCfg.getAuditTime()); - numCfg.setGroupId(group1.getGroupId()); - numCfg.setIsValid(baseCfg.getIsValid()); - numRegionList.add(numCfg); - map.put("numRegionList",numRegionList); + //如果protocolId非空非零,需要构造数值型域配置,多条相同协议的IP只需要一条数值域配置(目前没有不同协议IP&情况) + if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0 ){ + if(numGroupId==0){ + GroupCfg group1 = new GroupCfg(); + group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); + group1.setCompileId(baseIpCfg.getCompileId()); + group1.setAuditTime(baseCfg.getAuditTime()); + group1.setIsValid(baseCfg.getIsValid()); + groupRelationList.add(group1); + NumBoundaryCfg numCfg = new NumBoundaryCfg(); + numCfg.initDefaultValue(); + numCfg.setLowBoundary(baseIpCfg.getProtocolId()); + numCfg.setUpBoundary(baseIpCfg.getProtocolId()); + numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); + numCfg.setAuditTime(baseCfg.getAuditTime()); + numCfg.setGroupId(group1.getGroupId()); + numCfg.setIsValid(baseCfg.getIsValid()); + numRegionList.add(numCfg); + map.put("numRegionList",numRegionList); + numGroupId++; + } } } }else if(cfgType==2 || cfgType==3){ + List groupIdList = ConfigServiceUtil.getId(2, srcList.size()); + List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); for(int i=0;i groupIdList = ConfigServiceUtil.getId(2, srcList.size()); + List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); for(int i=0;i groupIdList = ConfigServiceUtil.getId(2, srcList.size()); + List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); for(int i=0;i