asn相关功能修改

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

@@ -61,6 +61,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected String exType;//导出类型
 	protected String hColumns;//导出隐藏列
 	
+	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
+	public String getCommonGroupIds() {
+		return commonGroupIds;
+	}
+	
+	public void setCommonGroupIds(String commonGroupIds) {
+		this.commonGroupIds = commonGroupIds;
+	}
+	
+	
+	
 	public String getExType() {
 		return exType;
 	}
@@ -119,13 +130,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 有效标识
 	 */
-	@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=90)
+	@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109)
 	@Expose
 	protected Integer isValid;
 	/**
 	 * 是否审核
 	 */
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25)
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37)
 	protected Integer isAudit;
 	/**
 	 * 创建人员
@@ -263,7 +274,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
 	@ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=31)
 	protected Integer doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
-	
 	protected Integer groupId;//仅用于copy属性使用
 	protected Integer regionId;//仅用于copy属性使用
 	protected Integer numberRegionGroupId;//仅用于copy属性使用

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

@@ -11,9 +11,11 @@ package com.nis.domain.configuration;
 import java.util.List;
 import java.util.Map;
 
+import com.google.gson.annotations.Expose;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
+import com.nis.util.Constants;
 import com.nis.util.excel.ExcelField;
 
 
@@ -84,6 +86,12 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private String country;
 	private String detail;
 	private List<AsnKeywordCfg> asnKeywords;
+	@ExcelField(title="log_total",sort=31)
+	private Long totalLogs;
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=20)
+	private Integer isAudit;
+	@ExcelField(title="do_log",dictType="DO_LOG",sort=27)
+	private Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
 	
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
@@ -93,9 +101,18 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 			
 		}
 	}*/
-	
-	
-	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getDoLog() {
+		return doLog;
+	}
+	public void setDoLog(Integer doLog) {
+		this.doLog = doLog;
+	}
 	public String getOrganization() {
 		return organization;
 	}
@@ -402,5 +419,11 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 		this.complexCfg = complexCfg;
 	}
 	
-	
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 }