diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 32a52ffc8..040d53a91 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -260,9 +260,9 @@ public class BaseIpCfg extends BaseCfg { @Override public void initDefaultValue(){ super.initDefaultValue(); - this.srcIp ="0.0.0.0"; +// this.srcIp ="0.0.0.0"; this.srcPortMask = "65535" ; - this.dstIp = "0.0.0.0" ; +// this.dstIp = "0.0.0.0" ; this.dstPortMask = "65535"; this.direction = 0; } diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index 3d2a71d7e..01a6f1e8e 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -16,7 +16,7 @@ package com.nis.domain.configuration; * @version V1.0 */ public class ComplexkeywordCfg extends BaseCfg{ - + protected String tableName; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -35,7 +35,7 @@ public class ComplexkeywordCfg extends BaseCfg{ /** * 编译id */ - protected Integer compileId; + protected Long compileId; /** * 表达式类型 */ @@ -81,13 +81,13 @@ public class ComplexkeywordCfg extends BaseCfg{ * @return compileId */ - public Integer getCompileId() { + public Long getCompileId() { return compileId; } /** * @param compileId the compileId to set */ - public void setCompileId(Integer compileId) { + public void setCompileId(Long compileId) { this.compileId = compileId; } /** @@ -97,10 +97,7 @@ public class ComplexkeywordCfg extends BaseCfg{ */ public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; + return this.exprType; } /** * @param exprType the exprType to set @@ -115,10 +112,7 @@ public class ComplexkeywordCfg extends BaseCfg{ */ public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + return this.matchMethod; } /** * @param matchMethod the matchMethod to set @@ -147,7 +141,23 @@ public class ComplexkeywordCfg extends BaseCfg{ protected void initDefaultValue() { // TODO Auto-generated method stub super.initDefaultValue(); + this.exprType=0; this.isHexbin = 0 ; + this.matchMethod=3; + } + /** + * tableName + * @return tableName + */ + + public String getTableName() { + return tableName; + } + /** + * @param tableName the tableName to set + */ + public void setTableName(String tableName) { + this.tableName = tableName; } } diff --git a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java index 2b14ad97e..23cd39a5a 100644 --- a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: DnsDomainConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class DnsDomainCfg extends ComplexkeywordCfg { - public static final String tableName="dns_domain_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -27,41 +24,16 @@ public class DnsDomainCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -2761078174512000577L; - /** - * district - * @return district - */ - - public String getDistrict() { - if(StringUtils.isBlank(district)) - return "QNAME"; - else - return district; - } - /** - * @param district the district to set - */ - public void setDistrict(String district) { - this.district = district; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; + this.district="QNAME"; } } diff --git a/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java b/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java index f03d03e6f..e169f0944 100644 --- a/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpReqHeadCfg extends ComplexkeywordCfg { - public static final String tableName="http_req_head_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -25,23 +24,15 @@ public class HttpReqHeadCfg extends ComplexkeywordCfg { private static final long serialVersionUID = 8231984530204284334L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java b/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java index a4c6e535f..7b6b9e05d 100644 --- a/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpResHeadCfg extends ComplexkeywordCfg { - public static final String tableName="http_res_head_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,24 +23,17 @@ public class HttpResHeadCfg extends ComplexkeywordCfg { */ private static final long serialVersionUID = 1306491838846197119L; + /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + this.exprType=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java index 5a0bdf53a..5e8f53b54 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailAttachContentConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailAttachContentCfg extends ComplexkeywordCfg { - public static final String tableName="mail_attach_content_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -27,33 +24,16 @@ public class MailAttachContentCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -5535627006599408223L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "AttachContent"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="AttachContent"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java index 183ec9980..dbf221fe8 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailAttachNameConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailAttachNameCfg extends ComplexkeywordCfg { - public static final String tableName="mail_attach_name_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -27,33 +24,16 @@ public class MailAttachNameCfg extends ComplexkeywordCfg { private static final long serialVersionUID = 9067647371707152226L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "AttachName"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="AttachName"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailContentCfg.java b/src/main/java/com/nis/domain/configuration/MailContentCfg.java index 35ab3eee8..386206738 100644 --- a/src/main/java/com/nis/domain/configuration/MailContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailContentCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailContentConfig.java * @Description: TODO @@ -27,33 +25,16 @@ public class MailContentCfg extends ComplexkeywordCfg{ private static final long serialVersionUID = -4257845942210782532L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "Content"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="Content"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailFromCfg.java b/src/main/java/com/nis/domain/configuration/MailFromCfg.java index e2c3d081c..0d12a3115 100644 --- a/src/main/java/com/nis/domain/configuration/MailFromCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailFromCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: MailFromConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class MailFromCfg extends ComplexkeywordCfg { - public static final String tableName="mail_from_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -28,33 +25,16 @@ public class MailFromCfg extends ComplexkeywordCfg { private static final long serialVersionUID = 7605303118334439422L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "From"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="From"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java index 8a4a7687e..19580cd92 100644 --- a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailSubjectConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailSubjectCfg extends ComplexkeywordCfg { - public static final String tableName="mail_subject_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -27,23 +24,16 @@ public class MailSubjectCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -547690498444330212L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "Subject"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 3; - else - return this.exprType; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="Subject"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailToCfg.java b/src/main/java/com/nis/domain/configuration/MailToCfg.java index 25d16bc03..2b27f6f0e 100644 --- a/src/main/java/com/nis/domain/configuration/MailToCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailToCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailToConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailToCfg extends ComplexkeywordCfg { - public static final String tableName="mail_to_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -28,33 +25,16 @@ public class MailToCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -7755270610917876826L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "To"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="To"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java index 58d983abd..47ecd12d4 100644 --- a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java +++ b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java @@ -44,16 +44,101 @@ public class NumBoundaryCfg extends BaseCfg { * 数值上界 */ protected Integer isHexbin ; + protected Long compileId; /* (non-Javadoc) * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() */ @Override - protected void initDefaultValue() { + public void initDefaultValue() { // TODO Auto-generated method stub super.initDefaultValue(); this.exprType = 3; this.matchMethod = 0; this.isHexbin = 0; } + /** + * lowBounadry + * @return lowBounadry + */ + + public Long getLowBounadry() { + return lowBounadry; + } + /** + * @param lowBounadry the lowBounadry to set + */ + public void setLowBounadry(Long lowBounadry) { + this.lowBounadry = lowBounadry; + } + /** + * upBoundary + * @return upBoundary + */ + + public Long getUpBoundary() { + return upBoundary; + } + /** + * @param upBoundary the upBoundary to set + */ + public void setUpBoundary(Long upBoundary) { + this.upBoundary = upBoundary; + } + /** + * exprType + * @return exprType + */ + + public Integer getExprType() { + return exprType; + } + /** + * @param exprType the exprType to set + */ + public void setExprType(Integer exprType) { + this.exprType = exprType; + } + /** + * matchMethod + * @return matchMethod + */ + + public Integer getMatchMethod() { + return matchMethod; + } + /** + * @param matchMethod the matchMethod to set + */ + public void setMatchMethod(Integer matchMethod) { + this.matchMethod = matchMethod; + } + /** + * isHexbin + * @return isHexbin + */ + + public Integer getIsHexbin() { + return isHexbin; + } + /** + * @param isHexbin the isHexbin to set + */ + public void setIsHexbin(Integer isHexbin) { + this.isHexbin = isHexbin; + } + /** + * compileId + * @return compileId + */ + + public Long getCompileId() { + return compileId; + } + /** + * @param compileId the compileId to set + */ + public void setCompileId(Long compileId) { + this.compileId = compileId; + } } diff --git a/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java b/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java index ad01022cd..6427c772a 100644 --- a/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java @@ -57,4 +57,17 @@ public class SipOriginalCfg extends ComplexkeywordCfg { else return this.matchMethod; } + /* (non-Javadoc) + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="ORIGINAL_CALL"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; + } + } diff --git a/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java b/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java index ed46d1af5..cbe5220ec 100644 --- a/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: SipTerminalConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class SipTerminalCfg extends ComplexkeywordCfg{ - public static final String tableName="sip_terminal_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -28,33 +25,16 @@ public class SipTerminalCfg extends ComplexkeywordCfg{ private static final long serialVersionUID = 7164399463108973251L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "TERMINAL_CALL"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="TERMINAL_CALL"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/SslCertCfg.java b/src/main/java/com/nis/domain/configuration/SslCertCfg.java index 7907ce3f2..1c79c03f5 100644 --- a/src/main/java/com/nis/domain/configuration/SslCertCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslCertCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: SslCertConfig.java * @Description: TODO @@ -28,34 +26,16 @@ public class SslCertCfg extends ComplexkeywordCfg{ private static final long serialVersionUID = -6121146112218278084L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "CERT"; + public void initDefaultValue() { // TODO Auto-generated method stub - else - return super.getDistrict(); - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + super.initDefaultValue(); + this.district="CERT"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/SslSniCfg.java b/src/main/java/com/nis/domain/configuration/SslSniCfg.java index a6bdf5175..2c889e2cd 100644 --- a/src/main/java/com/nis/domain/configuration/SslSniCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslSniCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: SslSniConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class SslSniCfg extends ComplexkeywordCfg { - public static final String tableName="ssl_sni_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -27,34 +24,16 @@ public class SslSniCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -6648964841408445457L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "SNI"; + public void initDefaultValue() { // TODO Auto-generated method stub - else - return super.getDistrict(); - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + super.initDefaultValue(); + this.district="SNI"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + }