gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service层 saveCfgIndexOf方法增加

Browse Source 
ip_drop国际化更改
This commit is contained in:
duandongmei
2018-10-06 12:16:12 +08:00
parent c06d7e11cb
commit 55d25bc92d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -106,6 +106,12 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
} }
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveCfgIndexOf(List<CfgIndexInfo> cfgIndexInfos){
for (CfgIndexInfo cfgIndexInfo : cfgIndexInfos) {
ipCfgDao.saveCfgIndex(cfgIndexInfo);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveIpCfg(CfgIndexInfo entity){ public void saveIpCfg(CfgIndexInfo entity){
//设置区域运营商信息 //设置区域运营商信息
setAreaEffectiveIds(entity); setAreaEffectiveIds(entity);
@@ -334,7 +340,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
Map<String,List> areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList); Map<String,List> areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList);
groupRelationList=areaMap.get("groupList"); groupRelationList=areaMap.get("groupList");
areaIpRegionList=areaMap.get("dstList"); 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.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime()); maatCfg.setAuditTime(cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList); maatCfg.setIpRegionList(ipRegionList);

4
src/main/resources/messages/message_en.properties
View File

@@ -1027,7 +1027,7 @@ MM_AV_IP=AV IP
MM_PIC_IP=Picture IP MM_PIC_IP=Picture IP
MM_PIC_URL=Picture URL MM_PIC_URL=Picture URL
MM_AV_URL=AV URL MM_AV_URL=AV URL
INLINE_IP_CB=IP Configuration INLINE_IP_CB=IP Drop
MM_VOIP_IP=VoIP IP MM_VOIP_IP=VoIP IP
MM_VOIP_ACCOUNT=VoIP Account MM_VOIP_ACCOUNT=VoIP Account
#=======================for import ip configuration================= #=======================for import ip configuration=================
@@ -1195,3 +1195,5 @@ dnat_ip_complex_loop=DNAT Complex Loop
snat_ip_complex_loop=SNAT Complex Loop snat_ip_complex_loop=SNAT Complex Loop
snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool 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 dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop
snat_policy=SNAT Reuse Policy
dnat_policy=DNAT Reuse Policy