gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ntc部分业务配置，增加黑名单选项功能，

Browse Source
This commit is contained in:
zhangwei
2018-12-22 12:55:24 +06:00
parent ae2323578e
commit d3f18c1fe8
34 changed files with 405 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -261,6 +261,8 @@ 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属性使用
@@ -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;
}
}

5
src/main/java/com/nis/domain/maat/MaatCfg.java
View File

@@ -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();