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

packet ip asn下发时加入用户自定义域ASN_ID,config_group_info表新增字段asn_id

Browse Source
This commit is contained in:
wangxin
2018-10-25 19:05:07 +08:00
parent fb2668d15f
commit 6855454715
8 changed files with 38 additions and 6 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

@@ -728,7 +728,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
List<IpCfg> areaIpRegionList = new ArrayList<>();
if(isAudit==Constants.AUDIT_YES) {
ConfigGroupInfo group=specificServiceCfgDao.getConfigGroupInfoByGroupId(Integer.parseInt(entity.getUserRegion4()));
if(group.getIsIssued()==1) {//复用，值下编译跟分组
if(group.getIsIssued()==1) {//复用，只下编译跟分组
maatCfg.initDefaultValue();
BeanUtils.copyProperties(entity, maatCfg);
maatCfg.setAction(entity.getAction());
@@ -754,6 +754,9 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
maatBean.setCreatorName(entity.getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
if(group.getAsnId()!=null) {
maatCfg.setUserRegion("ASN_ID="+group.getAsnId());
}
//调用服务接口下发配置数据
String json=gsonToJson(maatBean);
logger.info("ipaddr asn组复用配置下发配置参数："+json);
@@ -771,6 +774,9 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
if(group.getAsnId()!=null) {
maatCfg.setUserRegion("ASN_ID="+group.getAsnId());
}
//group
GroupCfg groupCfg=new GroupCfg();
groupCfg.setCompileId(entity.getCompileId());