diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 4531ab9cc..e0a6e4137 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -7,8 +7,5 @@ encoding//src/main/resources/matt.properties=UTF-8 encoding//src/main/resources/nis.properties=UTF-8 encoding//src/main/resources/table.properties=UTF-8 encoding//src/main/webapp/WEB-INF/include/header.jsp=UTF-8 -encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8 encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8 -encoding//src/main/webapp/static/common/jeesite.css=UTF-8 encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/src/main/java/com/nis/domain/configuration/AppIdCfg.java b/src/main/java/com/nis/domain/configuration/AppIdCfg.java index b67c068d7..6e66b5556 100644 --- a/src/main/java/com/nis/domain/configuration/AppIdCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppIdCfg.java @@ -15,8 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午11:24:28 * @version V1.0 */ -public class AppIdCfg extends BaseCfg { - +public class AppIdCfg extends BaseCfg { /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -85,5 +84,15 @@ public class AppIdCfg extends BaseCfg { public void setCompileId(Integer compileId) { this.compileId = compileId; } + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + + } } diff --git a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java new file mode 100644 index 000000000..02c231d47 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java @@ -0,0 +1,39 @@ +/** + *@Title: AreaIpCfg.java + *@Package com.nis.domain.configuration + *@Description TODO + *@author dell + *@date 2018年2月8日 上午9:47:29 + *@version 版本号 + */ +package com.nis.domain.configuration; + +/** + * @ClassName: AreaIpCfg.java + * @Description: TODO + * @author (dell) + * @date 2018年2月8日 上午9:47:29 + * @version V1.0 + */ +public class AreaIpCfg extends BaseIpCfg { + /** + * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = 2367503808235405524L; + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=0; + this.isAreaEffective=0; + this.areaEffectiveIds="NULL"; + } + +} diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 4d9cbd476..3c8600302 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -8,9 +8,10 @@ */ package com.nis.domain.configuration; -import java.io.Serializable; import java.util.Date; +import com.nis.domain.BaseEntity; + /** * @ClassName: BaseConfig.java * @Description: 基础配置 @@ -18,7 +19,8 @@ import java.util.Date; * @date 2018年2月5日 上午11:15:14 * @version V1.0 */ -public class BaseCfg implements Serializable { +public class BaseCfg extends BaseEntity { + protected String tableName; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -358,7 +360,37 @@ public class BaseCfg implements Serializable { public void setAreaEffectiveIds(String areaEffectiveIds) { this.areaEffectiveIds = areaEffectiveIds; } + /** + * cfgDesc + * @return cfgDesc + */ + public String getCfgDesc() { + return cfgDesc; + } + /** + * @param cfgDesc the cfgDesc to set + */ + public void setCfgDesc(String cfgDesc) { + this.cfgDesc = cfgDesc; + } + /** + * tableName + * @return tableName + */ + public String getTableName() { + return tableName; + } + /** + * @param tableName the tableName to set + */ + public void setTableName(String tableName) { + this.tableName = tableName; + } + + protected void initDefaultValue(){ + + } } diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index d79f51ee1..8574cbb20 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: BaseIpConfig.java * @Description: 基础IP配置 @@ -17,8 +15,7 @@ import org.apache.commons.lang3.StringUtils; * @date 2018年2月5日 下午5:02:24 * @version V1.0 */ -public class BaseIpCfg extends BaseCfg { - +public class BaseIpCfg extends BaseCfg { /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -33,7 +30,7 @@ public class BaseIpCfg extends BaseCfg { /** * 源IP地址 */ - protected String srcIp ="0.0.0.0"; + protected String srcIp ; /** * 源地址掩码 */ @@ -45,11 +42,11 @@ public class BaseIpCfg extends BaseCfg { /** * 源端口掩码 */ - protected String srcPortMask = "65535" ; + protected String srcPortMask ; /** * 目的IP地址 */ - protected String dstIp = "0.0.0.0" ; + protected String dstIp ; /** * 目的地址掩码 */ @@ -61,11 +58,11 @@ public class BaseIpCfg extends BaseCfg { /** * 目的端口掩码 */ - protected String dstPortMask = "65535"; + protected String dstPortMask ; /** * 方向 */ - protected Integer direction = 0; + protected Integer direction ; /** * 方向 */ @@ -112,13 +109,6 @@ public class BaseIpCfg extends BaseCfg { */ public String getSrcIpMask() { - if(!StringUtils.isBlank(srcIpMask)) - return srcIpMask; - else if(4==this.ipType) - return "255.255.255.255"; - else if(6==this.ipType) - return "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; - else return srcIpMask; } /** @@ -175,14 +165,7 @@ public class BaseIpCfg extends BaseCfg { */ public String getDstIpMask() { - if(!StringUtils.isBlank(dstIpMask)) return dstIpMask; - else if(4==this.ipType) - return "255.255.255.255"; - else if(6==this.ipType) - return "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; - else - return dstIpMask; } /** * @param dstIpMask the dstIpMask to set @@ -274,5 +257,14 @@ public class BaseIpCfg extends BaseCfg { public void setCompileId(Integer compileId) { this.compileId = compileId; } + @Override + public void initDefaultValue(){ + super.initDefaultValue(); + this.srcIp ="0.0.0.0"; + this.srcPortMask = "65535" ; + this.dstIp = "0.0.0.0" ; + this.dstPortMask = "65535"; + this.direction = 0; + } } diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 2f492fcba..56322a1a2 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月5日 下午5:26:02 * @version V1.0 */ -public class BaseStringCfg extends BaseCfg { +public class BaseStringCfg extends BaseCfg { /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) @@ -57,7 +57,7 @@ public class BaseStringCfg extends BaseCfg { /** * 是否hex二进制 */ - protected Integer isHexbin = 0; + protected Integer isHexbin; /** * exprType @@ -100,5 +100,14 @@ public class BaseStringCfg extends BaseCfg { public void setIsHexbin(Integer isHexbin) { this.isHexbin = isHexbin; } + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.isHexbin = 0; + } } diff --git a/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java b/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java index 2e663a13b..9c7031a57 100644 --- a/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java +++ b/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class ByteFeaturesCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,16 @@ public class ByteFeaturesCfg extends BaseStringCfg { */ private static final long serialVersionUID = 7790855206924149377L; - /** - * 字节特征 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 3; - 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=3; + this.matchMethod=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index df018e5d7..3d2a71d7e 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月5日 下午5:42:52 * @version V1.0 */ -public class ComplexkeywordCfg extends BaseCfg{ +public class ComplexkeywordCfg extends BaseCfg{ /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) @@ -47,7 +47,7 @@ public class ComplexkeywordCfg extends BaseCfg{ /** * 是否hex二进制 */ - protected Integer isHexbin = 0 ; + protected Integer isHexbin ; /** * district * @return district @@ -139,6 +139,15 @@ public class ComplexkeywordCfg extends BaseCfg{ */ public void setIsHexbin(Integer isHexbin) { this.isHexbin = isHexbin; + } + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() + */ + @Override + protected void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.isHexbin = 0 ; } } diff --git a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java index 12ec8b6ba..2b14ad97e 100644 --- a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java index e391f3374..6ef704a0e 100644 --- a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: DnsIpConfig.java * @Description: TODO @@ -17,7 +15,7 @@ import org.apache.commons.lang3.StringUtils; * @date 2018年2月5日 下午2:57:17 * @version V1.0 */ -public class DnsIpCfg extends BaseCfg { +public class DnsIpCfg extends BaseCfg { /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) @@ -33,7 +31,7 @@ public class DnsIpCfg extends BaseCfg { /** * 源IP地址 */ - private String srcIp ="0.0.0.0"; + private String srcIp; /** * 源地址掩码 */ @@ -45,11 +43,11 @@ public class DnsIpCfg extends BaseCfg { /** * 源端口掩码 */ - private String srcPortMask = "65535" ; + private String srcPortMask ; /** * 目的IP地址 */ - private String dstIp = "0.0.0.0" ; + private String dstIp ; /** * 目的地址掩码 */ @@ -61,11 +59,11 @@ public class DnsIpCfg extends BaseCfg { /** * 目的端口掩码 */ - private String dstPortMask = "65535"; + private String dstPortMask ; /** * 方向 */ - private Integer direction = 0; + private Integer direction ; /** * 方向 */ @@ -104,13 +102,6 @@ public class DnsIpCfg extends BaseCfg { */ public String getSrcIpMask() { - if(!StringUtils.isBlank(srcIpMask)) - return srcIpMask; - else if(4==this.ipType) - return "255.255.255.255"; - else if(6==this.ipType) - return "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; - else return srcIpMask; } /** @@ -167,13 +158,6 @@ public class DnsIpCfg extends BaseCfg { */ public String getDstIpMask() { - if(!StringUtils.isBlank(dstIpMask)) - return dstIpMask; - else if(4==this.ipType) - return "255.255.255.255"; - else if(6==this.ipType) - return "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; - else return dstIpMask; } /** @@ -238,4 +222,18 @@ public class DnsIpCfg extends BaseCfg { public void setProtocol(Integer protocol) { this.protocol = protocol; } + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() + */ + @Override + protected void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.srcIp ="0.0.0.0"; + this.srcPortMask = "65535" ; + this.dstIp = "0.0.0.0" ; + this.dstPortMask = "65535"; + this.direction = 0; + } + } diff --git a/src/main/java/com/nis/domain/configuration/FtpAddrCfg.java b/src/main/java/com/nis/domain/configuration/FtpAddrCfg.java index 63dce8131..8840a9a9a 100644 --- a/src/main/java/com/nis/domain/configuration/FtpAddrCfg.java +++ b/src/main/java/com/nis/domain/configuration/FtpAddrCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class FtpAddrCfg extends BaseStringCfg{ - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,43 +23,15 @@ public class FtpAddrCfg extends BaseStringCfg{ */ private static final long serialVersionUID = -7252491991496038882L; - /** - * ftp地址 - */ - private String cfgKeywords; - - /** - * cfgKeywords - * @return cfgKeywords - */ - - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#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; } + } diff --git a/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java b/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java index ffea8777f..e59b6a6f7 100644 --- a/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class FtpFileContentCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,32 +23,14 @@ public class FtpFileContentCfg extends BaseStringCfg { */ private static final long serialVersionUID = 7996351716704137873L; - /** - * 文件内容关键字 - */ - private String cfgKeyword; - /** - * cfgKeyword - * @return cfgKeyword - */ - - public String getCfgKeyword() { - return cfgKeyword; - } - /** - * @param cfgKeyword the cfgKeyword to set - */ - public void setCfgKeyword(String cfgKeyword) { - this.cfgKeyword = cfgKeyword; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ @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.matchMethod=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java b/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java index d2bb16a18..8bb64160e 100644 --- a/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java +++ b/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class FtpFileNameCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,32 +23,14 @@ public class FtpFileNameCfg extends BaseStringCfg { */ private static final long serialVersionUID = -3947991086808399842L; - /** - * 文件名关键字 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ @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.matchMethod=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/FtpIpCfg.java b/src/main/java/com/nis/domain/configuration/FtpIpCfg.java index e51db55a9..e4bf3af21 100644 --- a/src/main/java/com/nis/domain/configuration/FtpIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/FtpIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class FtpIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,4 +23,14 @@ public class FtpIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = -7878447087396996553L; + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=7; + } + } diff --git a/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java b/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java index 4dff677e0..8c89bb715 100644 --- a/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpBodyCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,32 +23,14 @@ public class HttpBodyCfg extends BaseStringCfg { */ private static final long serialVersionUID = 8231984530204284334L; - /** - * 关键字 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ @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.matchMethod=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java b/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java index b6e531021..f1bddbf86 100644 --- a/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpDomainCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,43 +23,16 @@ public class HttpDomainCfg extends BaseStringCfg { */ private static final long serialVersionUID = 8231984530204284334L; - /** - * 域名 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#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 3; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=3; } } diff --git a/src/main/java/com/nis/domain/configuration/HttpIpCfg.java b/src/main/java/com/nis/domain/configuration/HttpIpCfg.java index 61a9c0fad..7bee74573 100644 --- a/src/main/java/com/nis/domain/configuration/HttpIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class HttpIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = -4652367183432063965L; + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=4; + } } diff --git a/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java b/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java index e5a6c0f72..f03d03e6f 100644 --- a/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java @@ -16,7 +16,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java b/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java index 51d90f88c..a4c6e535f 100644 --- a/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java @@ -16,7 +16,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java index d9e1458bf..d8bb9e9a7 100644 --- a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpUrlCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,15 @@ public class HttpUrlCfg extends BaseStringCfg { */ private static final long serialVersionUID = 8231984530204284334L; - /** - * URL + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + } - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } - /* (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; - } } diff --git a/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java index 086e4c293..b8c7f54f0 100644 --- a/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpsUrlCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,15 @@ public class HttpsUrlCfg extends BaseStringCfg { */ private static final long serialVersionUID = -4633007108227664383L; - /** - * url地址 + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + } - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } - /* (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; - } } diff --git a/src/main/java/com/nis/domain/configuration/IpPortCfg.java b/src/main/java/com/nis/domain/configuration/IpPortCfg.java index c22384a02..0933d93f1 100644 --- a/src/main/java/com/nis/domain/configuration/IpPortCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpPortCfg.java @@ -15,8 +15,8 @@ package com.nis.domain.configuration; * @date 2018年2月5日 下午3:48:25 * @version V1.0 */ -public class IpPortCfg extends BaseCfg { - +public class IpPortCfg extends BaseIpCfg { + /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,41 +24,15 @@ public class IpPortCfg extends BaseCfg { */ private static final long serialVersionUID = 4664942095843594575L; - /** - * 编译id - */ - private Integer compileId; - /** - * 协议ID - */ - private Integer protocolId=0; - /** - * compileId - * @return compileId - */ - public Integer getCompileId() { - return compileId; - } - /** - * @param compileId the compileId to set + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() */ - public void setCompileId(Integer compileId) { - this.compileId = compileId; - } - /** - * protocolId - * @return protocolId - */ - - public Integer getProtocolId() { - return protocolId; - } - /** - * @param protocolId the protocolId to set - */ - public void setProtocolId(Integer protocolId) { - this.protocolId = protocolId; + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId = 0; } } diff --git a/src/main/java/com/nis/domain/configuration/L2tpIpCfg.java b/src/main/java/com/nis/domain/configuration/L2tpIpCfg.java index c6b79a85d..3f819ee5e 100644 --- a/src/main/java/com/nis/domain/configuration/L2tpIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/L2tpIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class L2tpIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -25,4 +24,14 @@ public class L2tpIpCfg extends BaseIpCfg { private static final long serialVersionUID = 2559118696091896747L; + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=12; + } + } diff --git a/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java b/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java index 2aa8f71b1..2138d32de 100644 --- a/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class L2tpUrlCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,39 +23,16 @@ public class L2tpUrlCfg extends BaseStringCfg { */ private static final long serialVersionUID = -5003009573787886287L; - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#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; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java index af43607f7..5a0bdf53a 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java index 28d9d2ac3..183ec9980 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/MailContentCfg.java b/src/main/java/com/nis/domain/configuration/MailContentCfg.java index 4f057f866..35ab3eee8 100644 --- a/src/main/java/com/nis/domain/configuration/MailContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailContentCfg.java @@ -18,7 +18,7 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailContentCfg extends ComplexkeywordCfg{ - + public static final String tableName="mail_content_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/MailFromCfg.java b/src/main/java/com/nis/domain/configuration/MailFromCfg.java index 25abe53cd..e2c3d081c 100644 --- a/src/main/java/com/nis/domain/configuration/MailFromCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailFromCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/MailIpCfg.java b/src/main/java/com/nis/domain/configuration/MailIpCfg.java index 89245eb9f..f63b34835 100644 --- a/src/main/java/com/nis/domain/configuration/MailIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class MailIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class MailIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = 2358673955555645618L; + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=5; + } } diff --git a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java index e2bb98837..8a4a7687e 100644 --- a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/MailToCfg.java b/src/main/java/com/nis/domain/configuration/MailToCfg.java index 52979e4bf..25d16bc03 100644 --- a/src/main/java/com/nis/domain/configuration/MailToCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailToCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/MmsIpCfg.java b/src/main/java/com/nis/domain/configuration/MmsIpCfg.java index 39c73964a..418cf80ba 100644 --- a/src/main/java/com/nis/domain/configuration/MmsIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/MmsIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class MmsIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class MmsIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = 321679812572480924L; - + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=14; + } + } diff --git a/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java b/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java index 6fd1527f7..2c5838a34 100644 --- a/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class MmsUrlCfg extends BaseStringCfg{ - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,16 @@ public class MmsUrlCfg extends BaseStringCfg{ */ private static final long serialVersionUID = 1057620148828322308L; - /** - * url地址 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#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; } + } diff --git a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java index 366337f40..58d983abd 100644 --- a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java +++ b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午10:37:45 * @version V1.0 */ -public class NumBoundaryCfg extends BaseCfg { +public class NumBoundaryCfg extends BaseCfg { /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) @@ -35,13 +35,25 @@ public class NumBoundaryCfg extends BaseCfg { /** * 数值上界 */ - protected Integer exprType = 3; + protected Integer exprType ; /** * 数值上界 */ - protected Integer matchMethod = 0; + protected Integer matchMethod ; /** * 数值上界 */ - protected Integer isHexbin = 0; + protected Integer isHexbin ; + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() + */ + @Override + protected void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType = 3; + this.matchMethod = 0; + this.isHexbin = 0; + } + } diff --git a/src/main/java/com/nis/domain/configuration/OpenvpnIpCfg.java b/src/main/java/com/nis/domain/configuration/OpenvpnIpCfg.java index edd9b556d..e13f421c6 100644 --- a/src/main/java/com/nis/domain/configuration/OpenvpnIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/OpenvpnIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class OpenvpnIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -25,4 +24,14 @@ public class OpenvpnIpCfg extends BaseIpCfg { private static final long serialVersionUID = 4279202465667553332L; + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=13; + } + } diff --git a/src/main/java/com/nis/domain/configuration/PptpIpCfg.java b/src/main/java/com/nis/domain/configuration/PptpIpCfg.java index 2e9c1cd8f..5d7e86f94 100644 --- a/src/main/java/com/nis/domain/configuration/PptpIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/PptpIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class PptpIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -25,4 +24,14 @@ public class PptpIpCfg extends BaseIpCfg { private static final long serialVersionUID = -9142381226867498019L; + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=11; + } + } diff --git a/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java b/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java index 6c0e817ff..abd80f1f4 100644 --- a/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class PptpUrlCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,15 @@ public class PptpUrlCfg extends BaseStringCfg { */ private static final long serialVersionUID = -1187550258390471722L; - /** - * url地址 + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + } - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } - /* (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; - } } diff --git a/src/main/java/com/nis/domain/configuration/RtmpIpCfg.java b/src/main/java/com/nis/domain/configuration/RtmpIpCfg.java index 4d0028556..3d229fd50 100644 --- a/src/main/java/com/nis/domain/configuration/RtmpIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtmpIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class RtmpIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -25,4 +24,14 @@ public class RtmpIpCfg extends BaseIpCfg { private static final long serialVersionUID = 781631345752315189L; + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=16; + } + } diff --git a/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java b/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java index 0137ba55e..da83069ca 100644 --- a/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class RtmpUrlCfg extends BaseStringCfg{ - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,16 @@ public class RtmpUrlCfg extends BaseStringCfg{ */ private static final long serialVersionUID = 6332351898872775040L; - /** - * url地址 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#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; } + } diff --git a/src/main/java/com/nis/domain/configuration/RtpIpCfg.java b/src/main/java/com/nis/domain/configuration/RtpIpCfg.java index 726c80ca2..00b5267af 100644 --- a/src/main/java/com/nis/domain/configuration/RtpIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtpIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class RtpIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class RtpIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = -3736146151740461502L; - + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=18; + } + } diff --git a/src/main/java/com/nis/domain/configuration/RtspIpCfg.java b/src/main/java/com/nis/domain/configuration/RtspIpCfg.java index 9443d39ca..5affa1a84 100644 --- a/src/main/java/com/nis/domain/configuration/RtspIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtspIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class RtspIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class RtspIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = 4852493659757353291L; - + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=15; + } + } diff --git a/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java b/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java index 19343f70b..079ee960d 100644 --- a/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class RtspUrlCfg extends BaseStringCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,42 +23,16 @@ public class RtspUrlCfg extends BaseStringCfg { */ private static final long serialVersionUID = 1954692023425674679L; - /** - * url地址 - */ - private String cfgKeywords; - /** - * cfgKeywords - * @return cfgKeywords - */ - public String getCfgKeywords() { - return cfgKeywords; - } - /** - * @param cfgKeywords the cfgKeywords to set - */ - public void setCfgKeywords(String cfgKeywords) { - this.cfgKeywords = cfgKeywords; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.BaseStringCfg#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; } + } diff --git a/src/main/java/com/nis/domain/configuration/SipIpCfg.java b/src/main/java/com/nis/domain/configuration/SipIpCfg.java index 11fe84939..1bdcfc9b4 100644 --- a/src/main/java/com/nis/domain/configuration/SipIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class SipIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class SipIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = 8707774919555732957L; - + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=17; + } + } diff --git a/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java b/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java index d7874e907..ad01022cd 100644 --- a/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java @@ -18,7 +18,7 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class SipOriginalCfg extends ComplexkeywordCfg { - + public static final String tableName="sip_original_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java b/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java index 47ddbbdfe..ed46d1af5 100644 --- a/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/SshIpCfg.java b/src/main/java/com/nis/domain/configuration/SshIpCfg.java index 75e31e272..843965bcc 100644 --- a/src/main/java/com/nis/domain/configuration/SshIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/SshIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class SshIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class SshIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = 5270478314830494950L; - + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=10; + } + } diff --git a/src/main/java/com/nis/domain/configuration/SslCertCfg.java b/src/main/java/com/nis/domain/configuration/SslCertCfg.java index 04ed4f15d..7907ce3f2 100644 --- a/src/main/java/com/nis/domain/configuration/SslCertCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslCertCfg.java @@ -18,7 +18,7 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class SslCertCfg extends ComplexkeywordCfg{ - + public static final String tableName="ssl_cert_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * diff --git a/src/main/java/com/nis/domain/configuration/SslIpCfg.java b/src/main/java/com/nis/domain/configuration/SslIpCfg.java index 8cc848629..cc8f2c833 100644 --- a/src/main/java/com/nis/domain/configuration/SslIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslIpCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class SslIpCfg extends BaseIpCfg { - /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -24,5 +23,15 @@ public class SslIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = -1334085146634344608L; - + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.protocolId=9; + } + } diff --git a/src/main/java/com/nis/domain/configuration/SslSniCfg.java b/src/main/java/com/nis/domain/configuration/SslSniCfg.java index 08b0f22c9..a6bdf5175 100644 --- a/src/main/java/com/nis/domain/configuration/SslSniCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslSniCfg.java @@ -18,7 +18,7 @@ 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(用一句话描述这个变量表示什么) *