into develop Conflicts: src/main/java/com/nis/domain/configuration/CfgIndexInfo.java src/main/resources/nis.properties src/main/webapp/WEB-INF/tags/sys/delRow.tag asn相关功能更改: IP ADDR:增加asn域 1、新增IP ADDR可选asn,如果asn未下发过(is_used=0),下发时asn的group需要标记为commonGroup(groupId为asn组织的groupId,regionId为asn的regionId)。 2、如果所选的asn组(asn组织的groupId)已经下发过(is_used=1),则下发maat时,asn域不需要下发。 3、策略取消时,如果有需要保留的公共组(commongRroupIds),需要将公共组的组号下发。 ASN GROUP: 1、新增asn,如果此asn的组织groupId已下发过(is_used=1),且此组织的groupId已被策略标记过全选(is_audit_all=1),则需要调用公共组域新增的接口,将新增的asn关键字下发。 2、修改asn,如果此asn的组织groupId已下发过(is_used=1),则需要调用公共组域修改的接口,修改已经下发的asn关键字域。 3、删除asn,如果此asn的组织groupId已下发过(is_used=1),则需要调用公共组域删除的接口,删除已经下发的asn关键字域。 ASN IP CFG: 1、新增asn ip,所选asn no的组首次下发(is_valid=0),需要将asn no的groupId标记为公共组;如果asn no非首次下发(is_valid=1),直接调用公共组新增域的接口。 2、修改 生效状态asn ip修改,调用公共组修改域接口直接修改 3、失效 直接调用公共组删除域接口,失效asn ip域
154 lines
2.9 KiB
Java
154 lines
2.9 KiB
Java
package com.nis.domain.basics;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.Date;
|
|
|
|
import com.nis.domain.configuration.BaseCfg;
|
|
import com.nis.util.excel.ExcelField;
|
|
|
|
/**
|
|
* @ClassName: AsnGroupInfo.java
|
|
* @Description: ASN分组
|
|
* @version V1.0
|
|
*/
|
|
public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
|
|
/**
|
|
*
|
|
*/
|
|
private static final long serialVersionUID = 7931466570918016654L;
|
|
private Integer groupId;
|
|
private Long issuedIPs;
|
|
@ExcelField(title="cfg_id",sort=301)
|
|
private Integer compileId;
|
|
@ExcelField(title="asn_name",sort=302)
|
|
private String organization;
|
|
@ExcelField(title="country_code",sort=303)
|
|
private String country;
|
|
@ExcelField(title="details",sort=304)
|
|
private String detail;
|
|
private Integer isValid;
|
|
@ExcelField(title="ASN",sort=305)
|
|
private Long asnId;
|
|
|
|
private Integer isUsed;
|
|
private Integer regionId;
|
|
|
|
|
|
public Integer getIsUsed() {
|
|
return isUsed;
|
|
}
|
|
public void setIsUsed(Integer isUsed) {
|
|
this.isUsed = isUsed;
|
|
}
|
|
public Long getIssuedIPs() {
|
|
return issuedIPs;
|
|
}
|
|
|
|
public void setIssuedIPs(Long issuedIPs) {
|
|
this.issuedIPs = issuedIPs;
|
|
}
|
|
|
|
public Integer getCompileId() {
|
|
return compileId;
|
|
}
|
|
|
|
public void setCompileId(Integer compileId) {
|
|
this.compileId = compileId;
|
|
}
|
|
|
|
public Integer getGroupId() {
|
|
return groupId;
|
|
}
|
|
|
|
public void setGroupId(Integer groupId) {
|
|
this.groupId = groupId;
|
|
}
|
|
|
|
public String getOrganization() {
|
|
return organization;
|
|
}
|
|
|
|
public void setOrganization(String organization) {
|
|
this.organization = organization;
|
|
}
|
|
|
|
public String getCountry() {
|
|
return country;
|
|
}
|
|
|
|
public void setCountry(String country) {
|
|
this.country = country;
|
|
}
|
|
|
|
public String getDetail() {
|
|
return detail;
|
|
}
|
|
|
|
public void setDetail(String detail) {
|
|
this.detail = detail;
|
|
}
|
|
|
|
public Integer getIsValid() {
|
|
return isValid;
|
|
}
|
|
|
|
public void setIsValid(Integer isValid) {
|
|
this.isValid = isValid;
|
|
}
|
|
|
|
public Date getCreateTime() {
|
|
return createTime;
|
|
}
|
|
|
|
public void setCreateTime(Date createTime) {
|
|
this.createTime = createTime;
|
|
}
|
|
|
|
public Long getCreatorId() {
|
|
return creatorId;
|
|
}
|
|
|
|
public void setCreatorId(Long creatorId) {
|
|
this.creatorId = creatorId;
|
|
}
|
|
|
|
public Date getEditTime() {
|
|
return editTime;
|
|
}
|
|
|
|
public void setEditTime(Date editTime) {
|
|
this.editTime = editTime;
|
|
}
|
|
|
|
public Long getEditorId() {
|
|
return editorId;
|
|
}
|
|
|
|
public void setEditorId(Long editorId) {
|
|
this.editorId = editorId;
|
|
}
|
|
|
|
public Long getAsnId() {
|
|
return asnId;
|
|
}
|
|
|
|
public void setAsnId(Long asnId) {
|
|
this.asnId = asnId;
|
|
}
|
|
|
|
|
|
public Integer getRegionId() {
|
|
return regionId;
|
|
}
|
|
public void setRegionId(Integer regionId) {
|
|
this.regionId = regionId;
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
// TODO Auto-generated method stub
|
|
return super.toString();
|
|
}
|
|
|
|
}
|