Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

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

@@ -17,25 +17,27 @@ public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
 	 */
 	private static final long serialVersionUID = 7931466570918016654L;
 	private Integer groupId;
-	private Integer orgGroupId;
+	private Long issuedIPs;
 	@ExcelField(title="cfg_id",sort=301)
 	private Integer compileId;
-	@ExcelField(title="organization",sort=302)
+	@ExcelField(title="asn_name",sort=302)
 	private String organization;
-	@ExcelField(title="organization",sort=303)
+	@ExcelField(title="country_code",sort=303)
 	private String country;
-	@ExcelField(title="organization",sort=304)
+	@ExcelField(title="details",sort=304)
 	private String detail;
 	private Integer isValid;
 	@ExcelField(title="ASN",sort=305)
 	private Long asnId;
 	
-	public Integer getOrgGroupId() {
-		return orgGroupId;
+	
+
+	public Long getIssuedIPs() {
+		return issuedIPs;
 	}
 
-	public void setOrgGroupId(Integer orgGroupId) {
-		this.orgGroupId = orgGroupId;
+	public void setIssuedIPs(Long issuedIPs) {
+		this.issuedIPs = issuedIPs;
 	}
 
 	public Integer getCompileId() {

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

@@ -0,0 +1,49 @@
+/**
+ *@Title: SslCertConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月6日 上午8:59:51
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @ClassName: SslCertConfig.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年2月6日 上午8:59:51
+ * @version V1.0
+ */
+public class AsnKeywordCfg extends BaseStringCfg<AsnKeywordCfg>{
+	private static final String tableName="asn_keyword_cfg";
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -6121146112218278084L;
+	@ExcelField(title="ASN",sort=201)
+	private String cfgKeywords;
+	/* (non-Javadoc)
+	 * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue()
+	 */
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.exprType=0;
+		this.matchMethod=3;
+		this.isHexbin=0;
+	}
+	@ExcelField(title="organization",sort=3)
+	protected String userRegion4;
+	
+	public static String getTablename() {
+		return tableName;
+	}
+	
+}

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

@@ -83,7 +83,7 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private String organization;
 	private String country;
 	private String detail;
-	private List<AsnGroupInfo> asnGroups;
+	private List<AsnKeywordCfg> asnKeywords;
 	
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
@@ -95,15 +95,16 @@ 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 List<AsnKeywordCfg> getAsnKeywords() {
+		return asnKeywords;
+	}
+	public void setAsnKeywords(List<AsnKeywordCfg> asnKeywords) {
+		this.asnKeywords = asnKeywords;
+	}
 	public void setOrganization(String organization) {
 		this.organization = organization;
 	}

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

@@ -42,21 +42,21 @@ public class AsnIpTemplate extends BasicTemplate{
 	public void setDestIpAddress(String destIpAddress) {
 		this.destIpAddress = destIpAddress;
 	}
-	@ExcelField(title="organization",align=2,sort=1)
+	@ExcelField(title="asn_name",align=2,sort=1)
 	public String getOrganization() {
 		return organization;
 	}
 	public void setOrganization(String organization) {
 		this.organization = organization;
 	}
-	@ExcelField(title="country",align=2,sort=14)
+	@ExcelField(title="country_code",align=2,sort=14)
 	public String getCountry() {
 		return country;
 	}
 	public void setCountry(String country) {
 		this.country = country;
 	}
-	@ExcelField(title="detail",align=2,sort=13)
+	@ExcelField(title="details",align=2,sort=13)
 	public String getDetail() {
 		return detail;
 	}