diff --git a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java index 0e78c5bbd..95de31a55 100644 --- a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java +++ b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java @@ -16,7 +16,14 @@ public class ConfigGroupInfo { private Integer groupType; @ExcelField(title="cfg_id",sort=301) private Integer compileId; + private Integer asnId; + public Integer getAsnId() { + return asnId; + } + public void setAsnId(Integer asnId) { + this.asnId = asnId; + } public Integer getCompileId() { return compileId; } diff --git a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml index acd98dc6b..1ca23e1cd 100644 --- a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml @@ -269,7 +269,7 @@ update cfg_index_info set is_valid=#{isValid} where cfg_id in (${ids}) - SELECT c.id,c.group_id,c.group_name,c.is_issued,c.insert_time,c.update_time,c.group_type FROM ( + SELECT c.id,c.group_id,c.group_name,c.is_issued,c.insert_time,c.update_time,c.group_type,c.asn_id FROM ( SELECT DISTINCT asn_ip_group FROM asn_ip_cfg WHERE is_valid !=-1) a LEFT JOIN config_group_info c ON a.asn_ip_group=c.group_id where c.group_type=#{groupType} diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index 3441dc29e..8d6fdf801 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -216,7 +216,7 @@ - select id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id + select id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id,asn_id from config_group_info c where c.group_id= #{groupId} @@ -234,7 +234,7 @@ - insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id) - values(#{id},#{groupId},#{groupName},#{isIssued},now(),#{groupType},#{compileId}) + insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id,asn_id) + values(#{id},#{groupId},#{groupName},#{isIssued},now(),#{groupType},#{compileId},#{asnId}) \ No newline at end of file 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 48007b825..821707df2 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -728,7 +728,7 @@ public class IpCfgService extends CrudService { List 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 { 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 { 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()); diff --git a/src/main/resources/sql/20181025/add_asn_id.sql b/src/main/resources/sql/20181025/add_asn_id.sql new file mode 100644 index 000000000..d884df536 --- /dev/null +++ b/src/main/resources/sql/20181025/add_asn_id.sql @@ -0,0 +1 @@ +ALTER TABLE config_group_info ADD COLUMN asn_id INT(11) NULL COMMENT 'asn 组对应的asn号' \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp index 030dbd4f7..d6537941c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp @@ -15,12 +15,13 @@ + * - selected> + selected> diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 6c2d882b7..d55375188 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -69,6 +69,12 @@ $("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click(); } }); + //处理asn id + $(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId")); + $(".asn").find("select[name='userRegion4']").on("change",function(){ + var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId"); + $(this).parents(".row").find("input[name='userRegion5']").val(asnId); + }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); @@ -202,6 +208,7 @@ if(flag){ if(isAsn==0){ $("input[name='userRegion4']").attr("disabled",true); + $("input[name='userRegion5']").attr("disabled",true); } $("input[name$='userRegion1']").attr("disabled",false); $("input[name$='exprType']").attr("disabled",false); diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp index 213350055..6147625e9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp @@ -230,6 +230,16 @@ + + + + : + + ${_cfg.userRegion5} + + + +