抗DDOS攻击导出添加日志总量、导出顺序调整

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

@@ -45,11 +45,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@SerializedName("ipType")
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=46)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45)
 	protected Integer ipPattern; 
 	@ExcelField(title="client_ip",sort=47)
 	protected String srcIpAddress; 
-	@ExcelField(title="ip",sort=45)
+	@ExcelField(title="server_ip",sort=46)
 	protected String destIpAddress;
 	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
 	protected Integer portPattern;

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;
 
 
@@ -86,6 +88,10 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	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;//缓存策略用户自定义域参数
 	
@@ -96,8 +102,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;
 	}

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

@@ -29,7 +29,23 @@ public class DdosIpCfg extends BaseIpCfg {
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
 	@ExcelField(title="pps_threadshold",sort=43)
 	private Long ppsThreadshold;
-
+	@ExcelField(title="log_total",sort=32)
+	private Long totalLogs;	
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=20)
+	private Integer isAudit;
+	
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 	public String getAntiddosProtocol() {
 		return antiddosProtocol;
 	}