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域
103 lines
2.4 KiB
Java
103 lines
2.4 KiB
Java
package com.nis.domain.specific;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.Date;
|
|
|
|
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
|
|
|
|
import com.nis.util.excel.ExcelField;
|
|
|
|
public class ConfigGroupInfo implements Serializable{
|
|
/**
|
|
*
|
|
*/
|
|
private static final long serialVersionUID = -4539188977409108742L;
|
|
private Integer id;
|
|
private Integer groupId;
|
|
@ExcelField(title="group_name",sort=302)
|
|
private String groupName;
|
|
private Integer isIssued;
|
|
private Date insertTime;
|
|
private Date updateTime;
|
|
private Integer groupType;
|
|
@ExcelField(title="cfg_id",sort=301)
|
|
private Integer compileId;
|
|
private Long asnId;
|
|
private Integer isAuditAll; //是否有策略选择了此公共组下发所有;
|
|
private Integer isUsed; //是否有策略选择了此公共组;
|
|
|
|
public Integer getIsUsed() {
|
|
return isUsed;
|
|
}
|
|
public void setIsUsed(Integer isUsed) {
|
|
this.isUsed = isUsed;
|
|
}
|
|
public Integer getIsAuditAll() {
|
|
return isAuditAll;
|
|
}
|
|
public void setIsAuditAll(Integer isAuditAll) {
|
|
this.isAuditAll = isAuditAll;
|
|
}
|
|
|
|
public Long getAsnId() {
|
|
return asnId;
|
|
}
|
|
public void setAsnId(Long asnId) {
|
|
this.asnId = asnId;
|
|
}
|
|
public Integer getCompileId() {
|
|
return compileId;
|
|
}
|
|
public void setCompileId(Integer compileId) {
|
|
this.compileId = compileId;
|
|
}
|
|
public Integer getId() {
|
|
return id;
|
|
}
|
|
public void setId(Integer id) {
|
|
this.id = id;
|
|
}
|
|
public Integer getGroupId() {
|
|
return groupId;
|
|
}
|
|
public void setGroupId(Integer groupId) {
|
|
this.groupId = groupId;
|
|
}
|
|
public String getGroupName() {
|
|
return groupName;
|
|
}
|
|
public void setGroupName(String groupName) {
|
|
this.groupName = groupName;
|
|
}
|
|
public Integer getIsIssued() {
|
|
return isIssued;
|
|
}
|
|
public void setIsIssued(Integer isIssued) {
|
|
this.isIssued = isIssued;
|
|
}
|
|
public Date getInsertTime() {
|
|
return insertTime;
|
|
}
|
|
public void setInsertTime(Date insertTime) {
|
|
this.insertTime = insertTime;
|
|
}
|
|
public Date getUpdateTime() {
|
|
return updateTime;
|
|
}
|
|
public void setUpdateTime(Date updateTime) {
|
|
this.updateTime = updateTime;
|
|
}
|
|
public Integer getGroupType() {
|
|
return groupType;
|
|
}
|
|
public void setGroupType(Integer groupType) {
|
|
this.groupType = groupType;
|
|
}
|
|
@Override
|
|
public String toString() {
|
|
// TODO Auto-generated method stub
|
|
return ReflectionToStringBuilder.toString(this);
|
|
}
|
|
|
|
}
|