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

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

@@ -261,18 +261,20 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	@ExcelField(title="do_log",dictType="DO_LOG",sort=30)
 	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属性使用
+	protected Integer numberRegionGroupId;//仅用于copy属性使用
 	protected Integer numberRegionRegionId;//仅用于copy属性使用
 	
-//	public Integer getNumberRegionGroupId() {
-//		return numberRegionGroupId;
-//	}
-//	public void setNumberRegionGroupId(Integer numberRegionGroupId) {
-//		this.numberRegionGroupId = numberRegionGroupId;
-//	}
+	public Integer getNumberRegionGroupId() {
+		return numberRegionGroupId;
+	}
+	public void setNumberRegionGroupId(Integer numberRegionGroupId) {
+		this.numberRegionGroupId = numberRegionGroupId;
+	}
 	public Integer getNumberRegionRegionId() {
 		return numberRegionRegionId;
 	}
@@ -964,5 +966,11 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setCancelRequestId(Integer cancelRequestId) {
 		this.cancelRequestId = cancelRequestId;
 	}
+	public Integer getDoBlackList() {
+		return doBlackList;
+	}
+	public void setDoBlackList(Integer doBlackList) {
+		this.doBlackList = doBlackList;
+	}
 	
 }

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

@@ -69,7 +69,28 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected Integer appCode;//仅用于copy属性使用
 	protected Integer behavCode;//仅用于copy属性使用
 	protected Integer specServiceId;//仅用于copy属性使用
+	protected String antiddosProtocol;//仅用于copy属性使用
+	protected Long bpsThreadshold;//仅用于copy属性使用
+	protected Long ppsThreadshold;//仅用于copy属性使用
 	
+	public String getAntiddosProtocol() {
+		return antiddosProtocol;
+	}
+	public void setAntiddosProtocol(String antiddosProtocol) {
+		this.antiddosProtocol = antiddosProtocol;
+	}
+	public Long getBpsThreadshold() {
+		return bpsThreadshold;
+	}
+	public void setBpsThreadshold(Long bpsThreadshold) {
+		this.bpsThreadshold = bpsThreadshold;
+	}
+	public Long getPpsThreadshold() {
+		return ppsThreadshold;
+	}
+	public void setPpsThreadshold(Long ppsThreadshold) {
+		this.ppsThreadshold = ppsThreadshold;
+	}
 	public Integer getAppCode() {
 		return appCode;
 	}

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

@@ -44,6 +44,14 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	protected Integer behavCode;//仅用于copy属性使用
 	protected Integer specServiceId;//仅用于copy属性使用
 	protected String domain;//仅用于copy属性使用
+	protected Integer dnsStrategyId;//仅用作复制属性使用
+	
+	public Integer getDnsStrategyId() {
+		return dnsStrategyId;
+	}
+	public void setDnsStrategyId(Integer dnsStrategyId) {
+		this.dnsStrategyId = dnsStrategyId;
+	}
 	public String getDomain() {
 		return domain;
 	}

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

@@ -16,7 +16,7 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
 	private static final long serialVersionUID = -2720862431960415564L;
 	private String indexTable="dns_res_strategy";
 	private Integer resGroup1Id;
-	@ExcelField(title="res_group_num",sort=3)
+	@ExcelField(title="res_group_num",sort=4)
 	private Integer resGroup1Num;
 	private Integer resGroup2Id;
 	private Integer resGroup2Num;
@@ -28,9 +28,9 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
 	private Integer resGroup5Num;
 	private Integer minTtl;
 	private Integer maxTtl;
-	@ExcelField(title="group",sort=2)
+	@ExcelField(title="group",sort=3)
 	private String  group1Name;
-	@ExcelField(title="min_ttl",sort=4)
+	@ExcelField(title="min_ttl",sort=5)
 	private String miTtlmax;
 	//仅作导入使用
 	private String ttl;

src/main/java/com/nis/domain/maat/MaatCfg.java

@@ -561,6 +561,9 @@ public class MaatCfg implements Serializable {
 		this.areaEffectiveIds = areaEffectiveIds;
 	}
 	public Integer getDoBlackList() {
+		if(doBlackList==null){
+			doBlackList = 1;
+		}
 		return doBlackList;
 	}
 	public void setDoBlackList(Integer doBlackList) {
@@ -678,7 +681,7 @@ public class MaatCfg implements Serializable {
 	}
 	public void initDefaultValue() {
 		this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT;
-		this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
+//		this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
 		this.configPercent=Constants.MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT;
 		this.configOption=Constants.MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT;
 		this.startTime=new Date();