asn 相关修改提交

(1)asn_ip_cfg增加四列
(2)新增asn_group_info表
(3)asn ip菜单移动到policy object下，新增审核审计菜单
(4)asn ip导入修改,适应新的需求放弃了使用AsnCache，直接从数据库查
(5)asn ip加入审核流程
(6)Packet IP选择asn时，改为选中一个组织，审核下发的配置为as号字符串域
(7)asn ip 新增业务新增function_service_dict字典，serviceId为400

src/main/java/com/nis/domain/configuration/BaseIpCfg.java

@@ -72,7 +72,28 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected String antiddosProtocol;//仅用于copy属性使用
 	protected Long bpsThreadshold;//仅用于copy属性使用
 	protected Long ppsThreadshold;//仅用于copy属性使用
+	protected String organization; //仅用于copy属性使用
+	protected String country; //仅用于copy属性使用
+	protected String detail; //仅用于copy属性使用
 	
+	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 String getAntiddosProtocol() {
 		return antiddosProtocol;
 	}

src/main/java/com/nis/domain/configuration/CfgIndexInfo.java

@@ -11,8 +11,7 @@ package com.nis.domain.configuration;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.cache.CacheKey;
-
+import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
 import com.nis.util.excel.ExcelField;
@@ -81,6 +80,10 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private String searchKeywords;// 列表关键字查询字段
 	
 	private Map<String,Object> userRegion;
+	private String organization;
+	private String country;
+	private String detail;
+	private List<AsnGroupInfo> asnGroups;
 	
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
@@ -92,6 +95,30 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	}*/
 	
 	
+	public List<AsnGroupInfo> getAsnGroups() {
+		return asnGroups;
+	}
+	public void setAsnGroups(List<AsnGroupInfo> asnGroups) {
+		this.asnGroups = asnGroups;
+	}
+	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 getSourceCompileId() {
 		return sourceCompileId;
 	}

src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java

@@ -16,8 +16,11 @@ public class AsnIpTemplate extends BasicTemplate{
 	private String cfgDesc;
 	private String userRegion1;
 	private String destIpAddress; 
+	private String organization; 
+	private String country; 
+	private String detail; 
 	
-	@ExcelField(title="config_describe",align=2,sort=1)
+//	@ExcelField(title="config_describe",align=2,sort=1)
 	public String getCfgDesc() {
 		return cfgDesc;
 	}
@@ -39,4 +42,26 @@ public class AsnIpTemplate extends BasicTemplate{
 	public void setDestIpAddress(String destIpAddress) {
 		this.destIpAddress = destIpAddress;
 	}
+	@ExcelField(title="organization",align=2,sort=1)
+	public String getOrganization() {
+		return organization;
+	}
+	public void setOrganization(String organization) {
+		this.organization = organization;
+	}
+	@ExcelField(title="country",align=2,sort=14)
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+	@ExcelField(title="detail",align=2,sort=13)
+	public String getDetail() {
+		return detail;
+	}
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
+	
 }