From e89f9187808e901013e79a0dfad93d356964a3a0 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Mon, 2 Jul 2018 15:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E3=80=81bgp=E3=80=81http=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E3=80=81=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=ADcfgType=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/AvContentCfgService.java | 44 ------------------- .../service/configuration/BgpCfgService.java | 1 - .../configuration/ControlPolicyService.java | 4 -- .../configuration/FileTransferCfgService.java | 9 +--- 4 files changed, 1 insertion(+), 57 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index f97925780..02b093af5 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -352,29 +352,17 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(voipIpList)){ - //TODO DELETE后期删除 - for (AvVoipIpCfg ipCfg : voipIpList) { - ipCfg.setCfgType("MM_VOIP_IP"); - } Map ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); } if(!StringUtil.isEmpty(voipAccountList)){ - //TODO DELETE后期删除 - for (AvVoipAccountCfg accountCfg : voipAccountList) { - accountCfg.setCfgType("MM_VOIP_ACCOUNT"); - } Map accountMap = cfgConvert(strRegionList,voipAccountList,2,entity,groupRelationList); groupRelationList=accountMap.get("groupList"); strRegionList=accountMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); @@ -652,19 +640,11 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ - //TODO DELETE后期删除 - for (BaseIpCfg ipCfg : list) { - ipCfg.setCfgType("MM_AV_IP"); - } Map ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); @@ -940,20 +920,12 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ - //TODO DELETE后期删除 - for (BaseIpCfg ipCfg : list) { - ipCfg.setCfgType("MM_PIC_IP"); - } Map ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); @@ -1194,20 +1166,12 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ - //TODO DELETE后期删除 - for (BaseStringCfg strCfg : list) { - strCfg.setCfgType("MM_AV_URL"); - } Map strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList); groupRelationList=strMap.get("groupList"); strRegionList=strMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); @@ -1447,20 +1411,12 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ - //TODO DELETE后期删除 - for (BaseStringCfg strCfg : list) { - strCfg.setCfgType("MM_PIC_URL"); - } Map strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList); groupRelationList=strMap.get("groupList"); strRegionList=strMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java index 3b1a58f1b..a20958714 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -270,7 +270,6 @@ public class BgpCfgService extends CrudService { maatCfg.setGroupNum(groupRelationList.size()); maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); - maatCfg.setUserRegion(entity.getCompileId()+""); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); maatBean.setAuditTime(entity.getAuditTime()); diff --git a/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java b/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java index 02e70e65c..f8ebb2231 100644 --- a/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java @@ -198,10 +198,6 @@ public class ControlPolicyService extends BaseService{ strRegionList=strMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index 179f759cc..726ffb3ef 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -463,9 +463,8 @@ public class FileTransferCfgService extends CrudService areaIpRegionList = new ArrayList(); if(isAudit==1){ - //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); - entity.setCfgType("NTC_FILE_DIGEST"); Map map = cfgConvert(digestRegionList,list,5,entity,groupRelationList); groupRelationList=map.get("groupList"); @@ -475,10 +474,6 @@ public class FileTransferCfgService extends CrudService0){ - //TODO DELETE后期删除 - for (AreaIpCfg areaIpCfga : areaIpCfgList) { - areaIpCfga.setCfgType("NTC_IP_RANGE"); - } Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); @@ -497,8 +492,6 @@ public class FileTransferCfgService extends CrudService