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

7
src/main/java/com/nis/domain/specific/ConfigGroupInfo.java
View File

@@ -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;
}

2
src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
View File

@@ -269,7 +269,7 @@
update cfg_index_info set is_valid=#{isValid} where cfg_id in (${ids})
</update>
<select id="getConfigGroupInfoList" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Integer">
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}
</select>

6
src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
View File

@@ -216,7 +216,7 @@
<!-- 根据groupId查出配置分组信息 -->
<select id="getConfigGroupInfoByGroupId" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Integer">
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}
</select>
<select id="getIssuedConfigGroupInfoByGroupIds" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -234,7 +234,7 @@
<!-- 新增配置分组信息 -->
<insert id="insertConfigGroupInfo" parameterType="com.nis.domain.specific.ConfigGroupInfo" useGeneratedKeys="true">
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})
</insert>
</mapper>

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());