asn ip、ip复用增加导出功能，增加NTC_KEYWORDS_URL_LOG日志

src/main/java/com/nis/domain/basics/AsnIpCfg.java

@@ -3,6 +3,7 @@ package com.nis.domain.basics;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
 
 public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 
@@ -16,14 +17,18 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	@Expose
 	private String ratelimit;
 	@Expose
+	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
 	@SerializedName("ipType")
 	private Integer ipType;
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
 	private Integer ipPattern; 
 	private String srcIpAddress; 
+	@ExcelField(title="server_ip",sort=5)
 	private String destIpAddress; 
 	private Integer portPattern; 
 	private String srcPort; 
 	private String destPort; 
+	@ExcelField(title="group",sort=2)
 	private String asnIpGroupName;//asn组名
 	private Integer asnIpGroup;//asn号
 	/**
@@ -41,6 +46,17 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	private Integer protocolId;
 	private Integer compileId=0;
 	
+	@ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90)
+	private String isIssued;
+	
+	
+	
+	public String getIsIssued() {
+		return isIssued;
+	}
+	public void setIsIssued(String isIssued) {
+		this.isIssued = isIssued;
+	}
 	public Integer getCompileId() {
 		return compileId;
 	}

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

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
 import com.nis.web.service.BaseService;
 
 /**
@@ -19,27 +20,52 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
 	private static final long serialVersionUID = -5902468971425910528L;
 	private String indexTable="ip_multiplex_pool_cfg";
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	@SerializedName("cfgId")
 	private Integer compileId;
 	@Expose
 	@SerializedName("addrType")
 	private String ipType;
 	@Expose
-	private Integer protocol;
-	@Expose
+	@ExcelField(title="server_ip",sort=6)
 	@SerializedName("ip")
 	private String destIpAddress;
 	@Expose
+	@ExcelField(title="server_port",sort=9)
 	private String port;
 	@Expose
-	private Integer direction;
-	@Expose
 	private String userRegion;
 	@Expose
 	private Integer location;
 	@Expose
-	private Integer policyGroup;	
+	private Integer policyGroup;
+	@ExcelField(title="group",sort=2)
 	private String  groupName;
+	/**
+	 * 方向
+	 */
+	@Expose
+	@SerializedName("direction")
+	@ExcelField(title="direction",dictType="DIRECTION",sort=13)
+	protected Integer direction ;
+	/**
+	 * 协议
+	 */
+	@Expose
+	@SerializedName("protocol")
+	@ExcelField(title="protocol",dictType="PROTOCOL",sort=12)
+	protected Integer protocol ;
+	
+	@ExcelField(title="isp" ,sort=3)
+	private String ispName;
+	
+	
+	public String getIspName() {
+		return ispName;
+	}
+	public void setIspName(String ispName) {
+		this.ispName = ispName;
+	}
 	public Integer getCompileId() {
 		return compileId;
 	}

src/main/java/com/nis/domain/log/NtcKeywordsUrlLog.java

@@ -0,0 +1,23 @@
+package com.nis.domain.log;
+
+public class NtcKeywordsUrlLog extends BaseLogEntity<NtcKeywordsUrlLog> {
+
+	private static final long serialVersionUID = -7697668215327123848L;
+
+	private String url;
+	private String website;//域名
+
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	
+	public String getWebsite() {
+		return website;
+	}
+	public void setWebsite(String website) {
+		this.website = website;
+	}
+}