From e8bd4a4d88c8113f97d8e08a38b732ac7c1e92f2 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Fri, 8 Jun 2018 16:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE=E8=BD=ACma?= =?UTF-8?q?at=E9=85=8D=E7=BD=AE=E6=97=B6=E5=88=86=E7=BB=84=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=A7=84=E5=88=99=E4=B8=BA=E4=B8=80=E6=9D=A1=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E5=88=9B=E5=BB=BA=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=88=86=E7=BB=84=EF=BC=8C=E5=8C=BA=E5=9F=9FIP=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A4=9A=E6=9D=A1IP=E9=85=8D=E7=BD=AE=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=B8=80=E4=B8=AA=E5=88=86=E7=BB=84=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=B1=82IP=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=BF=98?= =?UTF-8?q?=E9=9C=80=E9=A2=9D=E5=A4=96=E5=88=9B=E5=BB=BA=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=8F=B7=E9=85=8D=E7=BD=AE=E4=B8=8E=E5=8D=8F=E8=AE=AE=E5=8F=B7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=86=E7=BB=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../java/com/nis/web/service/BaseService.java | 66 ++++++++----------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index f61a34845..db80f076e 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -273,7 +273,6 @@ public abstract class BaseService { */ public static Map cfgConvert(List dstList,List srcList,Integer cfgType,BaseCfg baseCfg,List groupRelationList){ Map map = new HashMap(); - String regionValue = null; if(cfgType==1){ List numRegionList = new ArrayList(); Integer groupId = 0; @@ -281,8 +280,9 @@ public abstract class BaseService { BaseIpCfg baseIpCfg = (BaseIpCfg) srcList.get(i); IpCfg cfg = new IpCfg(); BeanUtils.copyProperties(baseIpCfg, cfg); - GroupCfg group = new GroupCfg(); - if(!cfg.getCfgType().equals(regionValue)){ + //区域IP配置，多条IP配置属于同一个分组，其他业务配置IP，一条配置一个分组 + if(groupId==0 || !cfg.getCfgType().equals(Constants.AREA_REGION)){ + GroupCfg group = new GroupCfg(); groupId = ConfigServiceUtil.getId(2, 1).get(0); group.setGroupId(groupId); group.setCompileId(baseCfg.getCompileId()); @@ -290,31 +290,27 @@ public abstract class BaseService { group.setIsValid(baseCfg.getIsValid()); groupRelationList.add(group); } - cfg.setGroupId(groupId); cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setIsValid(baseCfg.getIsValid()); cfg = ipConvert(cfg,baseIpCfg); dstList.add(cfg); - regionValue = cfg.getCfgType(); + //如果protocolId非空非零，需要构造数值型域配置 if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0){ - if(groupId==0){//只构造一次配置分组 - GroupCfg group1 = new GroupCfg(); - groupId = ConfigServiceUtil.getId(2, 1).get(0); - group1.setGroupId(groupId); - group1.setCompileId(baseIpCfg.getCompileId()); - group1.setAuditTime(baseIpCfg.getAuditTime()); - group1.setIsValid(baseCfg.getIsValid()); - groupRelationList.add(group1); - } + 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.setLowBoundary(baseIpCfg.getProtocolId()); numCfg.setUpBoundary(baseIpCfg.getProtocolId()); numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); numCfg.setAuditTime(baseCfg.getAuditTime()); - numCfg.setGroupId(groupId); + numCfg.setGroupId(group1.getGroupId()); numCfg.setCfgType(baseIpCfg.getCfgType()); cfg.setIsValid(baseCfg.getIsValid()); numRegionList.add(numCfg); @@ -324,16 +320,15 @@ public abstract class BaseService { }else if(cfgType==2 || cfgType==3){ for(int i=0;i