From 55d25bc92db9fa26843c5a88141df1d09e9e14f7 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Sat, 6 Oct 2018 12:16:12 +0800 Subject: [PATCH] =?UTF-8?q?service=E5=B1=82=20saveCfgIndexOf=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=A2=9E=E5=8A=A0=20ip=5Fdrop=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/service/configuration/IpCfgService.java | 8 +++++++- src/main/resources/messages/message_en.properties | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 74dc68a9d..c736b03c7 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -106,6 +106,12 @@ public class IpCfgService extends CrudService { } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void saveCfgIndexOf(List cfgIndexInfos){ + for (CfgIndexInfo cfgIndexInfo : cfgIndexInfos) { + ipCfgDao.saveCfgIndex(cfgIndexInfo); + } + } + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveIpCfg(CfgIndexInfo entity){ //设置区域运营商信息 setAreaEffectiveIds(entity); @@ -334,7 +340,7 @@ public class IpCfgService extends CrudService { Map areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList); groupRelationList=areaMap.get("groupList"); areaIpRegionList=areaMap.get("dstList"); - maatCfg.setAreaEffectiveIds(StringUtils.isBlank(cfg.getAreaEffectiveIds())?"0":cfg.getAreaEffectiveIds()); + //maatCfg.setAreaEffectiveIds(StringUtils.isBlank(cfg.getAreaEffectiveIds())?"0":cfg.getAreaEffectiveIds()); maatCfg.setAction(cfg.getAction()); maatCfg.setAuditTime(cfg.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index a3efb056b..7019bc4d1 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1027,7 +1027,7 @@ MM_AV_IP=AV IP MM_PIC_IP=Picture IP MM_PIC_URL=Picture URL MM_AV_URL=AV URL -INLINE_IP_CB=IP Configuration +INLINE_IP_CB=IP Drop MM_VOIP_IP=VoIP IP MM_VOIP_ACCOUNT=VoIP Account #=======================for import ip configuration================= @@ -1195,3 +1195,5 @@ dnat_ip_complex_loop=DNAT Complex Loop snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop +snat_policy=SNAT Reuse Policy +dnat_policy=DNAT Reuse Policy \ No newline at end of file