diff --git a/pom.xml b/pom.xml index 8feba6ef3..02eb9c8ae 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,11 @@ - + 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/ServiceDictInfo.java b/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java new file mode 100644 index 000000000..464d8ed9d --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java @@ -0,0 +1,151 @@ +package com.nis.domain.configuration; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.nis.domain.BaseEntity; +import com.nis.domain.SysMenu; +import com.nis.domain.SysUser; +/** + * 业务辅助表-业务字典信息表 + * @author zsl + * + */ +public class ServiceDictInfo extends BaseEntity{ + + private static final long serialVersionUID = 4680466118906894338L; + + private Integer serviceDictId; //service_dict_id 字典ID int N 主键，自增 + private Integer itemType; //item_type 数据类型 int N 1：分类 2：性质 3：标签 + private Integer itemCode; //item_code编码 int N + private String itemValue; //item_value 编码对应值 varchar2(64) N + private String itemDesc; //item_desc 描述信息 varcahr2(128) Y + private ServiceDictInfo parent; //parent_id 父ID number(9) N 无父属性，默认填0 + private Integer isLeaf; //is_leaf 是否叶子节点 int N 0-否 1-是；只有一级填0； + private Integer isValid; //is_valid 有效标志 int N 1-有效 0-无效 + private SysUser serviceDictCreator; //creator_id 创建人员 int N 取自sys_user.id + private Date createTime; //create_time 配置时间 date N + private SysUser serviceDictEditor; //editor_id 修改人员 int Y 取自sys_user.id + private Date editTime; //edit_time 修改时间 date Y + private List ChildrenList = new ArrayList();//字列表 + + private Date beginDate; // 开始日期 + private Date endDate; // 结束日期 + + public Integer getServiceDictId() { + return serviceDictId; + } + public void setServiceDictId(Integer serviceDictId) { + this.serviceDictId = serviceDictId; + } + public Integer getItemType() { + return itemType; + } + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + public Integer getItemCode() { + return itemCode; + } + public void setItemCode(Integer itemCode) { + this.itemCode = itemCode; + } + public String getItemValue() { + return itemValue; + } + public void setItemValue(String itemValue) { + this.itemValue = itemValue; + } + public String getItemDesc() { + return itemDesc; + } + public void setItemDesc(String itemDesc) { + this.itemDesc = itemDesc; + } + @JsonBackReference + public ServiceDictInfo getParent() { + return parent; + } + public void setParent(ServiceDictInfo parent) { + this.parent = parent; + } + public Integer getIsLeaf() { + return isLeaf; + } + public void setIsLeaf(Integer isLeaf) { + this.isLeaf = isLeaf; + } + public Integer getIsValid() { + return isValid; + } + public void setIsValid(Integer isValid) { + this.isValid = isValid; + } + + public SysUser getServiceDictCreator() { + return serviceDictCreator; + } + public void setServiceDictCreator(SysUser serviceDictCreator) { + this.serviceDictCreator = serviceDictCreator; + } + public Date getCreateTime() { + return createTime; + } + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public SysUser getServiceDictEditor() { + return serviceDictEditor; + } + public void setServiceDictEditor(SysUser serviceDictEditor) { + this.serviceDictEditor = serviceDictEditor; + } + public Date getEditTime() { + return editTime; + } + public void setEditTime(Date editTime) { + this.editTime = editTime; + } + public List getChildrenList() { + return ChildrenList; + } + public void setChildrenList(List childrenList) { + ChildrenList = childrenList; + } + public Date getBeginDate() { + return beginDate; + } + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + public Date getEndDate() { + return endDate; + } + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + @JsonIgnore + public static void sortList(List list, List sourcelist, Long parentId, boolean cascade){ + for (int i=0; i{ + + private static final long serialVersionUID = 893702645278342859L; + + private Integer sysDictId; //service_dict_id 字典ID int N 主键，自增 + private Integer itemType; //item_type 数据类型 int N 1：分类 2：性质 3：标签 + private Integer itemCode; //item_code编码 int N + private String itemValue; //item_value 编码对应值 varchar2(64) N + private String desc; //desc 描述信息 varcahr2(128) Y + private SysDictInfo parent; //parent_id 父ID number(9) N 无父属性，默认填0 + private Integer isLeaf; //is_leaf 是否叶子节点 int N 0-否 1-是；只有一级填0； + private Integer isValid; //is_valid 有效标志 int N 1-有效 0-无效 + private SysUser sysDictCreator; //creator_id 创建人员 int N 取自sys_user.id + private Date createTime; //create_time 配置时间 date N + private SysUser sysDictEditor; //editor_id 修改人员 int Y 取自sys_user.id + private Date editTime; //edit_time 修改时间 date Y + private List ChildrenList = new ArrayList();//字列表 + + private Date beginDate; // 开始日期 + private Date endDate; // 结束日期 + + + public Integer getSysDictId() { + return sysDictId; + } + public void setSysDictId(Integer sysDictId) { + this.sysDictId = sysDictId; + } + public Integer getItemType() { + return itemType; + } + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + public Integer getItemCode() { + return itemCode; + } + public void setItemCode(Integer itemCode) { + this.itemCode = itemCode; + } + public String getItemValue() { + return itemValue; + } + public void setItemValue(String itemValue) { + this.itemValue = itemValue; + } + public String getDesc() { + return desc; + } + public void setDesc(String desc) { + this.desc = desc; + } + public SysDictInfo getParent() { + return parent; + } + public void setParent(SysDictInfo parent) { + this.parent = parent; + } + public Integer getIsLeaf() { + return isLeaf; + } + public void setIsLeaf(Integer isLeaf) { + this.isLeaf = isLeaf; + } + public Integer getIsValid() { + return isValid; + } + public void setIsValid(Integer isValid) { + this.isValid = isValid; + } + public SysUser getSysDictCreator() { + return sysDictCreator; + } + public void setSysDictCreator(SysUser sysDictCreator) { + this.sysDictCreator = sysDictCreator; + } + public Date getCreateTime() { + return createTime; + } + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public SysUser getSysDictEditor() { + return sysDictEditor; + } + public void setSysDictEditor(SysUser sysDictEditor) { + this.sysDictEditor = sysDictEditor; + } + public Date getEditTime() { + return editTime; + } + public void setEditTime(Date editTime) { + this.editTime = editTime; + } + public List getChildrenList() { + return ChildrenList; + } + public void setChildrenList(List childrenList) { + ChildrenList = childrenList; + } + public Date getBeginDate() { + return beginDate; + } + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + public Date getEndDate() { + return endDate; + } + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + @JsonIgnore + public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ + for (int i=0; i page = ipCfgService.findPage(new Page(request, response, 1), baseIpCfg); + model.addAttribute("page", page); + model.addAttribute("serviceId", serviceId); + } + } + } + } + return "/cfg/ipBlockList"; } @RequestMapping(value = {"ipBlockForm"}) - public String ipBlockForm() { + public String ipBlockForm(Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + logger.info("sercice id is "+serviceId); + System.out.println("ipBlockForm loaded"); + if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + String className=ipCfgService.getClassName(tableName); + logger.info("class name is "+className); + String packageName=BaseIpCfg.class.getPackage().getName(); + try { + //通过反射获得BaseIpCfg的子类的实例，并调用子类的initDefaultValue初始化默认值 + Class clazz=Class.forName(packageName+"."+className); + BaseIpCfg ipcfg=(BaseIpCfg)clazz.newInstance(); + ipcfg.setTableName(tableName); + ipcfg.initDefaultValue(); + model.addAttribute("_ipCfg", ipcfg); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + // TODO Auto-generated catch block + logger.error("打开新增IP窗口失败",e); + e.printStackTrace(); + } + } + } + } + + return "/cfg/ipBlockForm"; + } + /** + * + * addIpPortCfg(新增IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(method=RequestMethod.POST,value = {"addIpCfg"}) + public String addIpCfg(@ModelAttribute("ipCfg") BaseIpCfg ipCfg) { + if(ipCfg!=null&&!StringUtils.isBlank(ipCfg.getTableName())){ + int result=ipCfgService.addIpCfg(ipCfg); + } return "/cfg/ipBlockForm"; } diff --git a/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java new file mode 100644 index 000000000..1b0f17756 --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java @@ -0,0 +1,245 @@ +package com.nis.web.controller.configuration; + +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.nis.domain.Page; +import com.nis.domain.SysDataDictionaryName; +import com.nis.domain.SysMenu; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.StringUtil; +import com.nis.util.StringUtils; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/configuration/serviceDictInfo") +public class ServiceDictInfoController extends BaseController { + + + @ModelAttribute + public ServiceDictInfo get(@RequestParam(required=false) Integer serviceDictId) { + if (!StringUtil.isEmpty(serviceDictId)){ + return serviceDictInfoService.getDictById(serviceDictId); + }else{ + return new ServiceDictInfo(); + } + + + } + + /** + * 根据serviceDictId查出配置对象 + * @param serviceDictId + * @param request + * @param response + * @param model + * @return + */ + @ResponseBody + @RequestMapping(value = "loadDataDict") + public ServiceDictInfo loadDataDict(@RequestParam(required=false) Integer serviceDictId,HttpServletRequest request, HttpServletResponse response, Model model){ + + return serviceDictInfoService.getDictById(serviceDictId); + } + + + /** + * 查询业务辅助表-业务字典信息列表 + * @param serviceDictInfo + * @param request + * @param response + * @param model + * @return + */ + @RequiresPermissions("sys:dict:view") + @RequestMapping(value = {"list", ""}) + public String list(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + + Page page = serviceDictInfoService.findDictList(new Page(request, response), serviceDictInfo); + model.addAttribute("page", page); + + return "/cfg/serviceDictList"; + } + + /** + * 进入添加或修改页面 + * @param serviceDictInfo + * @param model + * @return + */ + @RequestMapping(value={"form"}) + public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction) { + if(doAction!=null&&doAction.equals("0")){ + return "/cfg/serviceDictInfo"; + } + return "/cfg/serviceDictForm"; + } + /** + * 新增或修改 + * @param serviceDictInfo + * @param model + * @param redirectAttributes + * @return + */ + @RequiresPermissions("sys:dict:edit") + @RequestMapping(value = "saveOrUpdate") + public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes) { + + try { + serviceDictInfoService.saveOrUpdate(serviceDictInfo); + addMessage(redirectAttributes, "保存配置成功"); + } catch (Exception e) { + e.printStackTrace(); + addMessage(redirectAttributes, "保存配置失败！"); + } + + return "redirect:" + adminPath + "/configuration/serviceDictInfo/list"; + } + + + /** + * 删除 + * @param serviceDictInfo + * @param model + * @return + */ + @RequestMapping(value={"delete"}) + public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes) { + try { + serviceDictInfoService.deleteDict(serviceDictInfo); + addMessage(redirectAttributes, "删除配置成功"); + } catch (Exception e) { + e.printStackTrace(); + addMessage(redirectAttributes, "删除配置失败！"); + } + return "redirect:" + adminPath + "/configuration/serviceDictInfo/list"; + } + + + /** + * isShowHide是否显示隐藏菜单 + * @param extId + * @param isShowHidden + * @param response + * @return + */ + @RequiresPermissions("user") + @ResponseBody + @RequestMapping(value = "treeData") + public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response) { + List> mapList = Lists.newArrayList(); + List list = serviceDictInfoService.findAllDict(); + for (int i=0; i map = Maps.newHashMap(); + map.put("id", serviceDictInfo.getServiceDictId()); + map.put("pId", serviceDictInfo.getParent().getServiceDictId()); + map.put("name",serviceDictInfo.getItemValue()); + mapList.add(map); + } + } + return mapList; + } + + + + + //标签配置 + + + + + /** + * 进入添加或修改页面 + * @param serviceDictInfo + * @param model + * @return + */ + @RequestMapping(value={"markForm"}) + public String markForm(ServiceDictInfo serviceDictInfo, Model model,String doAction) { + if(doAction!=null&&doAction.equals("0")){ + return "/cfg/serviceDictMarkInfo"; + } + return "/cfg/serviceDictMarkForm"; + } + + + /** + * 查询业务辅助表-业务字典信息列表 + * @param serviceDictInfo + * @param request + * @param response + * @param model + * @return + */ + @RequiresPermissions("sys:dict:view") + @RequestMapping(value = {"markList"}) + public String markList(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + + Page page = serviceDictInfoService.findDictMarkList(new Page(request, response), serviceDictInfo); + model.addAttribute("page", page); + + return "/cfg/serviceDictMarkList"; + } + + + /** + * 新增或修改 + * @param serviceDictInfo + * @param model + * @param redirectAttributes + * @return + */ + @RequiresPermissions("sys:dict:edit") + @RequestMapping(value = "markSaveOrUpdate") + public String markSaveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes) { + + try { + serviceDictInfoService.saveOrUpdate(serviceDictInfo); + addMessage(redirectAttributes, "保存配置成功"); + } catch (Exception e) { + e.printStackTrace(); + addMessage(redirectAttributes, "保存配置失败！"); + } + + return "redirect:" + adminPath + "/configuration/serviceDictInfo/markList"; + } + + + /** + * 删除 + * @param serviceDictInfo + * @param model + * @return + */ + @RequestMapping(value={"markDelete"}) + public String markDelete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes) { + try { + serviceDictInfoService.deleteDict(serviceDictInfo); + addMessage(redirectAttributes, "删除配置成功"); + } catch (Exception e) { + e.printStackTrace(); + addMessage(redirectAttributes, "删除配置失败！"); + } + return "redirect:" + adminPath + "/configuration/serviceDictInfo/markList"; + } + +} diff --git a/src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java b/src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java new file mode 100644 index 000000000..9c3377d98 --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java @@ -0,0 +1,131 @@ +package com.nis.web.controller.configuration; + +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.nis.domain.Page; +import com.nis.domain.configuration.SysDictInfo; +import com.nis.util.StringUtil; +import com.nis.util.StringUtils; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/configuration/sysDictInfo") +public class SysDictInfoController extends BaseController { + + + @ModelAttribute + public SysDictInfo get(@RequestParam(required=false) Integer sysDictId) { + if (!StringUtil.isEmpty(sysDictId)){ + return sysDictInfoService.getDictById(sysDictId); + }else{ + return new SysDictInfo(); + } + + + } + + /** + * 根据sysDictId查出配置对象 + * @param sysDictId + * @param request + * @param response + * @param model + * @return + */ + @ResponseBody + @RequestMapping(value = "loadDataDict") + public SysDictInfo loadDataDict(@RequestParam(required=false) Integer sysDictId,HttpServletRequest request, HttpServletResponse response, Model model){ + + return sysDictInfoService.getDictById(sysDictId); + } + + + /** + * 查询业务辅助表-生效范围系统字典信息列表 + * @param sysDictInfo + * @param request + * @param response + * @param model + * @return + */ + @RequiresPermissions("sys:dict:view") + @RequestMapping(value = {"list", ""}) + public String list(SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + + Page page = sysDictInfoService.findDictList(new Page(request, response), sysDictInfo); + model.addAttribute("page", page); + + return "/cfg/sysDictList"; + } + + /** + * 进入添加或修改页面 + * @param sysDictInfo + * @param model + * @return + */ + @RequestMapping(value={"form"}) + public String form(SysDictInfo sysDictInfo, Model model,String doAction) { + if(doAction!=null&&doAction.equals("0")){ + return "/cfg/sysDictInfo"; + } + return "/cfg/sysDictForm"; + } + /** + * 新增或修改 + * @param sysDictInfo + * @param model + * @param redirectAttributes + * @return + */ + @RequiresPermissions("sys:dict:edit") + @RequestMapping(value = "saveOrUpdate") + public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes) { + + try { + sysDictInfoService.saveOrUpdate(sysDictInfo); + addMessage(redirectAttributes, "保存配置成功"); + } catch (Exception e) { + e.printStackTrace(); + addMessage(redirectAttributes, "保存配置失败！"); + } + + return "redirect:" + adminPath + "/configuration/sysDictInfo/list"; + } + + + /** + * 删除 + * @param sysDictInfo + * @param model + * @return + */ + @RequestMapping(value={"delete"}) + public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes) { + try { + sysDictInfoService.deleteDict(sysDictInfo); + addMessage(redirectAttributes, "删除配置成功"); + } catch (Exception e) { + e.printStackTrace(); + addMessage(redirectAttributes, "删除配置失败！"); + } + return "redirect:" + adminPath + "/configuration/sysDictInfo/list"; + } + + +} diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java index 296b047b8..20ee186b6 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java @@ -1,11 +1,26 @@ package com.nis.web.dao.configuration; +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.BaseIpCfg; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; /** * IP相关配置数据处理类 * @author dell * */ -public class IpCfgDao { - +@MyBatisDao +public interface IpCfgDao extends CrudDao{ + public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; + public BaseIpCfg get(BaseIpCfg entity) ; + public List findList(BaseIpCfg entity) ; + public List findAllList(BaseIpCfg entity) ; + public int insert(BaseIpCfg entity) ; + public int updateByPrimaryKeySelective(BaseIpCfg entity) ; + public int updateValid(BaseIpCfg entity) ; + public int delete(BaseIpCfg entity) ; } diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml new file mode 100644 index 000000000..ab4e44f49 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFG_ID, CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, + SRC_PORT_MASK ,DST_IP ,DST_IP_MASK, DST_PORT, DST_PORT_MASK, + DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT, + CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, + SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS + + + CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, + SRC_PORT_MASK ,DST_IP ,DST_IP_MASK, DST_PORT, DST_PORT_MASK, + DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT, + CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, + SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS + + + #{cfgDesc,jdbcType=VARCHAR},#{ipType,jdbcType=INTEGER}, + #{srcIp,jdbcType=VARCHAR},#{srcIpMask,jdbcType=VARCHAR},#{srcPort,jdbcType=VARCHAR}, + #{srcPortMask,jdbcType=VARCHAR},#{dstIp,jdbcType=VARCHAR},#{dstIpMask,jdbcType=VARCHAR}, + #{dstPort,jdbcType=VARCHAR},#{dstPortMask,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, + #{protocol,jdbcType=INTEGER},#{protocolId,jdbcType=INTEGER},#{action,jdbcType=INTEGER}, + #{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, + #{areaEffectiveIds,jdbcType=VARCHAR} + + + + + + + SELECT LAST_INSERT_ID() + + insert into ${tableName} ( + + )values ( + + ) + + + update ${tableName} + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + ip_type = #{ipType,jdbcType=INTEGER}, + + + src_ip = #{srcIp,jdbcType=VARCHAR}, + + + src_ip_mask = #{srcIpMask,jdbcType=VARCHAR}, + + + src_port = #{srcPort,jdbcType=VARCHAR}, + + + src_port_mask = #{srcPortMask,jdbcType=VARCHAR}, + + + dst_ip = #{dstIp,jdbcType=VARCHAR}, + + + dst_ip_mask = #{dstIpMask,jdbcType=VARCHAR}, + + + dst_port = #{dstPort,jdbcType=VARCHAR}, + + + dst_port_mask = #{srcPortMask,jdbcType=VARCHAR}, + + + direction = #{direction,jdbcType=INTEGER}, + + + protocol = #{protocol,jdbcType=INTEGER}, + + + protocol_id = #{protocolId,jdbcType=INTEGER}, + + + action = #{action,jdbcType=INTEGER}, + + + is_valid = #{isValid,jdbcType=INTEGER}, + + + is_audit = #{isAudit,jdbcType=INTEGER}, + + + creator_id = #{creatorId,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + editor_id = #{editorId,jdbcType=INTEGER}, + + + edit_time = #{editTime,jdbcType=TIMESTAMP}, + + + auditor_id = #{auditorId,jdbcType=INTEGER}, + + + audit_time = #{auditTime,jdbcType=TIMESTAMP}, + + + service_id = #{serviceId,jdbcType=INTEGER}, + + + request_id = #{requestId,jdbcType=INTEGER}, + + + compile_id = #{compileId,jdbcType=INTEGER}, + + + is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, + + + classify = #{classify,jdbcType=VARCHAR}, + + + attribute = #{attribute,jdbcType=VARCHAR}, + + + lable = #{lable,jdbcType=VARCHAR}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR} + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java new file mode 100644 index 000000000..a21d7b986 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java @@ -0,0 +1,50 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface ServiceDictInfoDao extends CrudDao { + + /** + * 查询分类性质字典列表， + * @param serviceDictInfo + * @return + */ + List findDictList(ServiceDictInfo serviceDictInfo); + + /** + * 查询标签字典列表 + * @param serviceDictInfo + * @return + */ + List findDictMarkList(ServiceDictInfo serviceDictInfo); + + + /** + * 添加字典信息 + * @param serviceDictInfo + */ + void insertDict(ServiceDictInfo serviceDictInfo); + + /** + * 根据主键查询字典详细信息 + * @param serviceDictId + * @return + */ + ServiceDictInfo getDictById(Integer serviceDictId); + + /** + * 查询所有非叶子节点字典配置信息 + * @return + */ + List findAllDict(); + + + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml new file mode 100644 index 000000000..35dadf221 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + s.service_dict_id AS serviceDictId, + s.item_type AS itemType, + s.item_code AS itemCode, + s.item_value AS itemValue, + s.item_desc AS itemDesc, + s.parent_id AS "parent.serviceDictId", + s.is_leaf AS isLeaf, + s.is_valid AS isValid, + s.creator_id AS "serviceDictCreator.id", + s.create_time AS createTime, + s.editor_id AS "serviceDictEditor.id", + s.edit_time AS editTime + + + + + + + + + + + + + + + + + + + + insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time) + values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, + #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, + #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, + #{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, + #{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP}) + + + + + + + + + + UPDATE service_dict_info s SET + s.service_dict_id = #{serviceDictId}, + s.item_type = #{itemType}, + s.item_code = #{itemCode}, + s.item_value = #{itemValue}, + s.item_desc = #{itemDesc}, + s.parent_id = #{parent.serviceDictId}, + s.is_leaf = #{isLeaf}, + s.creator_id = #{serviceDictCreator.id}, + s.editor_id = #{serviceDictEditor.id}, + s.edit_time = #{editTime} + WHERE s.service_dict_id = #{serviceDictId} + + + + + + UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId} + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java new file mode 100644 index 000000000..1571febc0 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java @@ -0,0 +1,40 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import com.nis.domain.configuration.SysDictInfo; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface SysDictInfoDao extends CrudDao { + + /** + * 查询生效范围字典列表， + * @param sysDictInfo + * @return + */ + List findDictList(SysDictInfo sysDictInfo); + + + /** + * 添加字典信息 + * @param sysDictInfo + */ + void insertDict(SysDictInfo sysDictInfo); + + /** + * 根据主键查询字典详细信息 + * @param sysDictId + * @return + */ + SysDictInfo getDictById(Integer sysDictId); + + /** + * 查询所有非叶子节点字典配置信息 + * @return + */ + List findAllDict(); + + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml new file mode 100644 index 000000000..44b88d8e3 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + s.sys_dict_id AS sysDictId, + s.item_type AS itemType, + s.item_code AS itemCode, + s.item_value AS itemValue, + s.item_desc AS itemDesc, + s.parent_id AS "parent.sysDictId", + s.is_leaf AS isLeaf, + s.is_valid AS isValid, + s.creator_id AS "sysDictCreator.id", + s.create_time AS createTime, + s.editor_id AS "sysDictEditor.id", + s.edit_time AS editTime + + + + + + + + + + + + + insert into sys_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time) + values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, + #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, + #{parent.sysDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, + #{sysDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, + #{sysDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP}) + + + + + + + + + + UPDATE sys_dict_info s SET + s.sys_dict_id = #{sysDictId}, + s.item_type = #{itemType}, + s.item_code = #{itemCode}, + s.item_value = #{itemValue}, + s.item_desc = #{itemDesc}, + s.parent_id = #{parent.sysDictId}, + s.is_leaf = #{isLeaf}, + s.creator_id = #{sysDictCreator.id}, + s.editor_id = #{sysDictEditor.id}, + s.edit_time = #{editTime} + WHERE s.sys_dict_id = #{sysDictId} + + + + + + UPDATE sys_dict_info s set s.is_valid = #{isValid} where s.sys_dict_id = #{sysDictId} + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml deleted file mode 100644 index 00c573ab9..000000000 --- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java index 8b2cb85b3..6d84a74b5 100644 --- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java @@ -1,5 +1,11 @@ package com.nis.web.dao.systemService; -public interface ServiceConfigInfoDao { +import org.apache.ibatis.annotations.Param; +import com.nis.domain.ServiceConfigInfo; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; +@MyBatisDao +public interface ServiceConfigInfoDao extends CrudDao{ + public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId); } diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml new file mode 100644 index 000000000..3daa36498 --- /dev/null +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java index de3b35ea0..65dbe0e36 100644 --- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java +++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java @@ -1,10 +1,11 @@ package com.nis.web.dao.systemService; +import org.apache.ibatis.annotations.Param; + import com.nis.domain.SystemServiceInfo; import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface SystemServiceInfoDao extends CrudDao { - } diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 3af041c88..57254769b 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import com.nis.domain.SysRole; import com.nis.domain.SysUser; +import com.nis.util.Configurations; import com.nis.util.StringUtils; /** @@ -142,8 +143,32 @@ public abstract class BaseService { return scopeSql.toString(); } - - + /** + * + * getTableName(获取Class对应的表名) + * (这里描述这个方法适用条件 – 可选) + * @param clazz + * @return + *String + * @exception + * @since 1.0.0 + */ + public String getTableName(String clazz){ + return Configurations.getStringProperty(clazz, null); + } + /** + * + * getTableName(获取表名对应的Class) + * (这里描述这个方法适用条件 – 可选) + * @param clazz + * @return + *String + * @exception + * @since 1.0.0 + */ + public String getClassName(String tableName){ + return Configurations.getStringProperty(tableName, null); + } diff --git a/src/main/java/com/nis/web/service/CrudService.java b/src/main/java/com/nis/web/service/CrudService.java index d022bac38..c91f75056 100644 --- a/src/main/java/com/nis/web/service/CrudService.java +++ b/src/main/java/com/nis/web/service/CrudService.java @@ -3,7 +3,6 @@ */ package com.nis.web.service; -import java.lang.reflect.Field; import java.util.List; import org.apache.ibatis.session.ExecutorType; @@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.nis.domain.BaseEntity; import com.nis.domain.Page; -import com.nis.util.Constants; import com.nis.web.dao.CrudDao; /** diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 609f50b49..f3ffbbea3 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -1,13 +1,88 @@ package com.nis.web.service.configuration; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.nis.domain.configuration.BaseIpCfg; +import com.nis.web.dao.configuration.IpCfgDao; +import com.nis.web.service.CrudService; + /** * IP相关配置事务类 * @author dell * */ @Service -public class IpCfgService { - +public class IpCfgService extends CrudService { + @Autowired + protected IpCfgDao ipCfgDao; + /** + * + * addIpCfg(新增IP类配置) + * (继承BaseIpCfg这个类方可使用) + * @param baseIpCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + public int addIpCfg(BaseIpCfg baseIpCfg){ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseIpCfg.setTableName(tableName); + logger.info("save "+tableName); + return ipCfgDao.insert(baseIpCfg); + } + /** + * + * updateIpCfg(更新IP类配置) + * (继承BaseIpCfg这个类方可使用) + * @param baseIpCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + public int updateIpCfg(BaseIpCfg baseIpCfg){ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + baseIpCfg.setTableName(tableName); + logger.info("update "+tableName); + return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg); + } + /** + * + * getIpCfg(根据IP与类名获取IP配置) + * (继承BaseIpCfg这个类方可使用) + * @param clazz + * @param id + * @return + *BaseIpCfg + * @exception + * @since 1.0.0 + */ + public BaseIpCfg getIpCfgById(Class clazz,long id){ + String tableName=getTableName(clazz.getSimpleName()); + logger.info("get "+tableName); + return ipCfgDao.getById(tableName, id); + } + /** + * + * getIpCfg(根据IP与类名获取IP配置) + * (继承BaseIpCfg这个类方可使用) + * @param clazz + * @param id + * @return + *BaseIpCfg + * @exception + * @since 1.0.0 + */ + public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + baseIpCfg.setTableName(tableName); + logger.info("get "+tableName); + return ipCfgDao.get(baseIpCfg); + } + } diff --git a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java new file mode 100644 index 000000000..8ead8cd3a --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java @@ -0,0 +1,120 @@ +package com.nis.web.service.configuration; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.google.common.collect.Lists; +import com.nis.domain.Page; +import com.nis.domain.SysDataDictionaryItem; +import com.nis.domain.SysMenu; +import com.nis.domain.SysUser; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.DateUtil; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.ServiceDictInfoDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + +@Service +public class ServiceDictInfoService extends BaseService{ + + @Autowired + private ServiceDictInfoDao serviceDictInfoDao; + + /** + * 查询分类性质字典分页 + * @param page + * @param serviceDictInfo + * @return + */ + public Page findDictList(Page page, ServiceDictInfo serviceDictInfo) { + // 设置分页参数 + serviceDictInfo.setPage(page); + // 执行分页查询 + List list = Lists.newArrayList(); + List sourcelist = serviceDictInfoDao.findDictList(serviceDictInfo); + ServiceDictInfo.sortList(list, sourcelist, 0l, true); + page.setList(sourcelist); + return page; + } + + /** + * 查询标签分页 + * @param page + * @param serviceDictInfo + * @return + */ + public Page findDictMarkList(Page page, ServiceDictInfo serviceDictInfo) { + // 设置分页参数 + serviceDictInfo.setPage(page); + // 执行分页查询 + List list = Lists.newArrayList(); + List sourcelist = serviceDictInfoDao.findDictMarkList(serviceDictInfo); + ServiceDictInfo.sortList(list, sourcelist, 0l, true); + page.setList(sourcelist); + return page; + } + + + /** + * 根据主键查询字典详细信息 + * @param serviceDictId + * @return + */ + public ServiceDictInfo getDictById(Integer serviceDictId) { + return serviceDictInfoDao.getDictById(serviceDictId); + } + + /** + * 新增或修改业务字典表 + * @param serviceDictInfo + */ + public void saveOrUpdate(ServiceDictInfo serviceDictInfo) { + SysUser user = UserUtils.getUser(); + if(StringUtil.isEmpty(serviceDictInfo.getServiceDictId())) {//新增 + serviceDictInfo.setIsValid(1); + serviceDictInfo.setServiceDictCreator(user); + serviceDictInfo.setCreateTime(new Date()); + serviceDictInfo.setServiceDictEditor(user); + serviceDictInfo.setEditTime(serviceDictInfo.getCreateTime()); + if(serviceDictInfo.getParent()==null||(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()==null)){ + ServiceDictInfo parent = new ServiceDictInfo(); + parent.setServiceDictId(0); + serviceDictInfo.setParent(parent); + } + serviceDictInfoDao.insertDict(serviceDictInfo); + + } + + else {//修改 + serviceDictInfo.setServiceDictEditor(user); + serviceDictInfo.setEditTime(new Date()); + serviceDictInfoDao.update(serviceDictInfo); + } + + } + + /** + * 查询所有非叶子节点字典配置信息 + * @return + */ + public List findAllDict() { + + return serviceDictInfoDao.findAllDict(); + } + + /** + * 删除 + * @param serviceDictInfo + */ + public void deleteDict(ServiceDictInfo serviceDictInfo) { + serviceDictInfo.setIsValid(0); + serviceDictInfoDao.delete(serviceDictInfo); + } + + + +} diff --git a/src/main/java/com/nis/web/service/configuration/SysDictInfoService.java b/src/main/java/com/nis/web/service/configuration/SysDictInfoService.java new file mode 100644 index 000000000..faf396199 --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/SysDictInfoService.java @@ -0,0 +1,100 @@ +package com.nis.web.service.configuration; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.google.common.collect.Lists; +import com.nis.domain.Page; +import com.nis.domain.SysUser; +import com.nis.domain.configuration.SysDictInfo; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.SysDictInfoDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + +@Service +public class SysDictInfoService extends BaseService{ + + @Autowired + private SysDictInfoDao sysDictInfoDao; + + /** + * 查询生效范围字典分页 + * @param page + * @param sysDictInfo + * @return + */ + public Page findDictList(Page page, SysDictInfo sysDictInfo) { + // 设置分页参数 + sysDictInfo.setPage(page); + // 执行分页查询 + List list = Lists.newArrayList(); + List sourcelist = sysDictInfoDao.findDictList(sysDictInfo); + SysDictInfo.sortList(list, sourcelist, 0, true); + page.setList(sourcelist); + return page; + } + + + /** + * 根据主键查询生效范围字典详细信息 + * @param sysDictId + * @return + */ + public SysDictInfo getDictById(Integer sysDictId) { + return sysDictInfoDao.getDictById(sysDictId); + } + + /** + * 新增或修改生效范围字典表 + * @param sysDictInfo + */ + public void saveOrUpdate(SysDictInfo sysDictInfo) { + SysUser user = UserUtils.getUser(); + if(StringUtil.isEmpty(sysDictInfo.getSysDictId())) {//新增 + sysDictInfo.setIsValid(1); + sysDictInfo.setSysDictCreator(user); + sysDictInfo.setCreateTime(new Date()); + sysDictInfo.setSysDictEditor(user); + sysDictInfo.setEditTime(sysDictInfo.getCreateTime()); + if(sysDictInfo.getParent()==null||(sysDictInfo.getParent()!=null&&sysDictInfo.getParent().getSysDictId()==null)){ + SysDictInfo parent = new SysDictInfo(); + parent.setSysDictId(0); + sysDictInfo.setParent(parent); + } + sysDictInfoDao.insertDict(sysDictInfo); + + } + + else {//修改 + sysDictInfo.setSysDictEditor(user); + sysDictInfo.setEditTime(new Date()); + sysDictInfoDao.update(sysDictInfo); + } + + } + + /** + * 查询所有非叶子节点生效范围字典配置信息 + * @return + */ + public List findAllDict() { + + return sysDictInfoDao.findAllDict(); + } + + /** + * 删除 + * @param sysDictInfo + */ + public void deleteDict(SysDictInfo sysDictInfo) { + sysDictInfo.setIsValid(0); + sysDictInfoDao.delete(sysDictInfo); + } + + + +} diff --git a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java new file mode 100644 index 000000000..58611bf69 --- /dev/null +++ b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java @@ -0,0 +1,16 @@ +package com.nis.web.service.systemService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.nis.domain.ServiceConfigInfo; +import com.nis.web.dao.systemService.ServiceConfigInfoDao; + +@Service +public class ServiceConfigInfoService { + @Autowired + protected ServiceConfigInfoDao serviceConfigInfoDao; + public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){ + return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId); + } +} diff --git a/src/main/resources/table.properties b/src/main/resources/table.properties index d565fc94e..23f928555 100644 --- a/src/main/resources/table.properties +++ b/src/main/resources/table.properties @@ -1,58 +1,147 @@ #由于数据中心日志表的表名会变动,所以本系统中将日志中心的表名提取到配置文件中方便后期修改 #\u6570\u636E\u4E2D\u5FC3hive\u6570\u636E\u5E93\u8868\u540D -df_ip_port_log=t_df_ip_port_log -df_http_req_log=t_df_http_req_log_v3 -df_http_res_log=t_df_http_res_log_v3 -df_http_keyword_log=t_df_http_keyword_log +#df_ip_port_log=t_df_ip_port_log +#df_http_req_log=t_df_http_req_log_v3 +#df_http_res_log=t_df_http_res_log_v3 +#df_http_keyword_log=t_df_http_keyword_log -df_mail_log=t_df_mail_log -df_dns_log=t_df_dns_log -df_ftp_log=t_df_ftp_log -df_pptp_log=t_df_pptp_log -df_l2tp_log=t_df_l2tp_log -df_ipsec_log=t_df_ipsec_log -df_openvpn_log=t_df_openvpn_log -df_ssh_log=t_df_ssh_log -df_ssl_log=t_df_ssl_log -df_tunnel_random_log=t_df_tunnel_random_log +#df_mail_log=t_df_mail_log +#df_dns_log=t_df_dns_log +#df_ftp_log=t_df_ftp_log +#df_pptp_log=t_df_pptp_log +#df_l2tp_log=t_df_l2tp_log +#df_ipsec_log=t_df_ipsec_log +#df_openvpn_log=t_df_openvpn_log +#df_ssh_log=t_df_ssh_log +#df_ssl_log=t_df_ssl_log +#df_tunnel_random_log=t_df_tunnel_random_log #\u6570\u636E\u4E2D\u5FC3\u795E\u901A\u6570\u636E\u5E93A\u7248\u8868\u540D -DfIpPortLogA=t_xa_df_ip_port_log_hit_mpp -DfHttpReqLogA=t_xa_df_http_req_log_hit_mpp -DfHttpResLogA=t_xa_df_http_res_log_hit_mpp -DfHttpKeywordLogA=t_xa_df_http_keyword_log_hit_mpp +#DfIpPortLogA=t_xa_df_ip_port_log_hit_mpp +#DfHttpReqLogA=t_xa_df_http_req_log_hit_mpp +#DfHttpResLogA=t_xa_df_http_res_log_hit_mpp +#DfHttpKeywordLogA=t_xa_df_http_keyword_log_hit_mpp -DfMailLogA=t_xa_df_mail_log_hit_mpp -DfDnsLogA=t_xa_df_dns_log_hit_mpp -DfFtpLogA=t_xa_df_ftp_log_hit_mpp -DfPptpLogA=t_xa_df_pptp_log_hit_mpp -DfL2tpLogA=t_xa_df_l2tp_log_hit_mpp -DfIpsecLogA=t_xa_df_ipsec_log_hit_mpp -DfOpenvpnLogA=t_xa_df_openvpn_log_hit_mpp -DfSshLogA=t_xa_df_ssh_log_hit_mpp -DfSslLogA=t_xa_df_ssl_log_hit_mpp -DfTunnelRandomLogA=t_xa_df_tunnel_random_log_hit_mpp +#DfMailLogA=t_xa_df_mail_log_hit_mpp +#DfDnsLogA=t_xa_df_dns_log_hit_mpp +#DfFtpLogA=t_xa_df_ftp_log_hit_mpp +#DfPptpLogA=t_xa_df_pptp_log_hit_mpp +#DfL2tpLogA=t_xa_df_l2tp_log_hit_mpp +#DfIpsecLogA=t_xa_df_ipsec_log_hit_mpp +#DfOpenvpnLogA=t_xa_df_openvpn_log_hit_mpp +#DfSshLogA=t_xa_df_ssh_log_hit_mpp +#DfSslLogA=t_xa_df_ssl_log_hit_mpp +#DfTunnelRandomLogA=t_xa_df_tunnel_random_log_hit_mpp #\u795E\u901A\u6570\u636E\u5E93B\u7248\u8868\u540D -DfIpPortLogB=t_xa_df_ip_port_log_mpp -DfHttpReqLogB=t_xa_df_http_req_log_mpp -DfHttpResLogB=t_xa_df_http_res_log_mpp -DfHttpKeywordLogB=t_xa_df_http_keyword_log_mpp - -DfMailLogB=t_xa_df_mail_log_mpp -DfDnsLogB=t_xa_df_dns_log_mpp -DfFtpLogB=t_xa_df_ftp_log_mpp -DfPptpLogB=t_xa_df_pptp_log_mpp -DfL2tpLogB=t_xa_df_l2tp_log_mpp -DfIpsecLogB=t_xa_df_ipsec_log_mpp -DfOpenvpnLogB=t_xa_df_openvpn_log_mpp -DfSshLogB=t_xa_df_ssh_log_mpp -DfSslLogB=t_xa_df_ssl_log_mpp -DfTunnelRandomLogB=t_xa_df_tunnel_random_log_mpp - - - +#DfIpPortLogB=t_xa_df_ip_port_log_mpp +#DfHttpReqLogB=t_xa_df_http_req_log_mpp +#DfHttpResLogB=t_xa_df_http_res_log_mpp +#DfHttpKeywordLogB=t_xa_df_http_keyword_log_mpp +#DfMailLogB=t_xa_df_mail_log_mpp +#DfDnsLogB=t_xa_df_dns_log_mpp +#DfFtpLogB=t_xa_df_ftp_log_mpp +#DfPptpLogB=t_xa_df_pptp_log_mpp +#DfL2tpLogB=t_xa_df_l2tp_log_mpp +#DfIpsecLogB=t_xa_df_ipsec_log_mpp +#DfOpenvpnLogB=t_xa_df_openvpn_log_mpp +#DfSshLogB=t_xa_df_ssh_log_mpp +#DfSslLogB=t_xa_df_ssl_log_mpp +#DfTunnelRandomLogB=t_xa_df_tunnel_random_log_mpp +DnsIpCfg=dns_ip_cfg +DnsDomainCfg=dns_domain_cfg +IpPortCfg=ip_port_cfg +HttpDomainCfg=http_domain_cfg +HttpUrlCfg=http_url_cfg +HttpBodyCfg=http_body_cfg +HttpReqHeadCfg=http_req_head_cfg +HttpResHeadCfg=http_res_head_cfg +HttpIpCfg=http_ip_cfg +MailFromCfg=mail_from_cfg +MailToCfg=mail_to_cfg +MailSubjectCfg=mail_subject_cfg +MailContentCfg=mail_content_cfg +MailAttachNameCfg=mail_attach_name_cfg +MailAttachContentCfg=mail_attach_content_cfg +MailIpCfg=mail_ip_cfg +FtpAddrCfg=ftp_addr_cfg +FtpFileNameCfg=ftp_file_name_cfg +FtpFileContentCfg=ftp_file_content_cfg +FtpIpCfg=ftp_ip_cfg +L2tpIpCfg=l2tp_ip_cfg +L2tpUrlCfg=l2tp_url_cfg +PptpIpCfg=pptp_ip_cfg +PptpUrlCfg=pptp_url_cfg +OpenvpnIpCfg=openvpn_ip_cfg +SshIpCfg=ssh_ip_cfg +SslCertCfg=ssl_cert_cfg +SslSniCfg=ssl_sni_cfg +SslIpCfg=ssl_ip_cfg +SipIpCfg=sip_ip_cfg +SipOriginalCfg=sip_original_cfg +SipTerminalCfg=sip_terminal_cfg +RtpIpCfg=rtp_ip_cfg +MmsIpCfg=mms_ip_cfg +MmsUrlCfg=mms_url_cfg +RtspIpCfg=rtsp_ip_cfg +RtspUrlCfg=rtsp_url_cfg +RtmpIpCfg=rtmp_ip_cfg +RtmpUrlCfg=rtmp_url_cfg +HttpsUrlCfg=https_url_cfg +HttpsContentReplaceCfg=https_content_replace_cfg +ByteFeaturesCfg=byte_features_cfg +NumBoundaryCfg=num_boundary_cfg +ComplexKeywordCfg=complex_keyword_cfg +AppIdCfg=app_id_cfg +AreaIpCfg=area_ip_cfg + +dns_ip_cfg=DnsIpCfg +dns_domain_cfg=DnsDomainCfg +ip_port_cfg=IpPortCfg +http_domain_cfg=HttpDomainCfg +http_url_cfg=HttpUrlCfg +http_body_cfg=HttpBodyCfg +http_req_head_cfg=HttpReqHeadCfg +http_res_head_cfg=HttpResHeadCfg +http_ip_cfg=HttpIpCfg +mail_from_cfg=MailFromCfg +mail_to_cfg=MailToCfg +mail_subject_cfg=MailSubjectCfg +mail_content_cfg=MailContentCfg +mail_attach_name_cfg=MailAttachNameCfg +mail_attach_content_cfg=MailAttachContentCfg +mail_ip_cfg=MailIpCfg +ftp_addr_cfg=FtpAddrCfg +ftp_file_name_cfg=FtpFileNameCfg +ftp_file_content_cfg=FtpFileContentCfg +ftp_ip_cfg=FtpIpCfg +l2tp_ip_cfg=L2tpIpCfg +l2tp_url_cfg=L2tpUrlCfg +pptp_ip_cfg=PptpIpCfg +pptp_url_cfg=PptpUrlCfg +openvpn_ip_cfg=OpenvpnIpCfg +ssh_ip_cfg=SshIpCfg +ssl_cert_cfg=SslCertCfg +ssl_sni_cfg=SslSniCfg +ssl_ip_cfg=SslIpCfg +sip_ip_cfg=SipIpCfg +sip_original_cfg=SipOriginalCfg +sip_terminal_cfg=SipTerminalCfg +rtp_ip_cfg=RtpIpCfg +mms_ip_cfg=MmsIpCfg +mms_url_cfg=MmsUrlCfg +rtsp_ip_cfg=RtspIpCfg +rtsp_url_cfg=RtspUrlCfg +rtmp_ip_cfg=RtmpIpCfg +rtmp_url_cfg=RtmpUrlCfg +https_url_cfg=HttpsUrlCfg +https_content_replace_cfg=HttpsContentReplaceCfg +byte_features_cfg=ByteFeaturesCfg +num_boundary_cfg=NumBoundaryCfg +complex_keyword_cfg=ComplexKeywordCfg +app_id_cfg=AppIdCfg +area_ip_cfg=AreaIpCfg diff --git a/src/main/webapp/WEB-INF/tlds/fns.tld b/src/main/webapp/WEB-INF/tlds/fns.tld index f76513a66..78a75fc41 100644 --- a/src/main/webapp/WEB-INF/tlds/fns.tld +++ b/src/main/webapp/WEB-INF/tlds/fns.tld @@ -212,6 +212,14 @@ ${fns:getDictList(key)} + + 获取字典Map列表 + getDictOption + com.nis.util.DictUtils + java.util.List getDictOption(java.lang.String) + ${fns:getDictOption(key)} + + 获取字典标签 getDictLabel @@ -249,7 +257,7 @@ getDictCodeDefault com.nis.util.DictUtils java.lang.String getDictCode(java.lang.String, java.lang.String) - ${fns:getDictCode(dictKey, itemValue)} + ${fns:getDictCodeDefault(dictKey, itemValue)} diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp new file mode 100644 index 000000000..743cc5fb7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp @@ -0,0 +1,170 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + 分类性质配置管理 + + + + + +
+ + + + +

+ 分类性质配置管理 +

+ +
+
+
+
+
+ 分类性质配置${not empty serviceDictInfo.serviceDictId?'修改':'添加'}查看
+
+ +
+
+ +
+ + +
+ + + + + +
+ + <%--
+ +
--%> + +
+ <%-- --%> + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ <%-- --%> + + + +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+ + +
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp new file mode 100644 index 000000000..166eaa0a4 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp @@ -0,0 +1,91 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + 分类性质配置管理 + + + + +
+ + + + +

+ 分类性质配置管理 +

+ +
+
+
+
+
+ 分类性质配置查看
+
+ +
+ + +
+ + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp new file mode 100644 index 000000000..bb559abc9 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp @@ -0,0 +1,139 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +分类性质配置信息 + + + + + + + +
+ + +
+
+
+
+
+ +
+
+
+ +
+ + + +
+ + + + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + +
编码编码对应值描述信息数据类型创建时间操作
${serviceDictInfo.itemCode}${serviceDictInfo.itemValue}${fns:abbr(serviceDictInfo.itemDesc,15)}${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")} + + +
+ 操作 + + +
+ +
+
${page}
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkForm.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkForm.jsp new file mode 100644 index 000000000..923e08db4 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkForm.jsp @@ -0,0 +1,160 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + 标签配置管理 + + + + + +
+ + + + +

+ 标签配置管理 +

+ +
+
+
+
+
+ 标签配置${not empty serviceDictInfo.serviceDictId?'修改':'添加'}查看
+
+ +
+
+ +
+ + +
+ + + + + +
+ + <%--
+ +
--%> + +
+ <%-- --%> + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ <%-- --%> + + + +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+ + +
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkInfo.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkInfo.jsp new file mode 100644 index 000000000..6cb7198cb --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkInfo.jsp @@ -0,0 +1,91 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + 标签配置管理 + + + + +
+ + + + +

+ 标签配置管理 +

+ +
+
+
+
+
+ 标签配置查看
+
+ +
+ + +
+ + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp new file mode 100644 index 000000000..c2fdefd12 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp @@ -0,0 +1,139 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +分标签配置信息 + + + + + + + +
+ + +
+
+
+
+
+ +
+
+
+ +
+ + + +
+ + + + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + +
编码编码对应值描述信息数据类型创建时间操作
${serviceDictInfo.itemCode}${serviceDictInfo.itemValue}${fns:abbr(serviceDictInfo.itemDesc,15)}${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")} + + +
+ 操作 + + +
+ +
+
${page}
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp new file mode 100644 index 000000000..b59199f0f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp @@ -0,0 +1,168 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + 生效范围配置管理 + + + + + +
+ + + + +

+ 生效范围配置管理 +

+ +
+
+
+
+
+ 分类性质配置${not empty sysDictInfo.sysDictId?'修改':'添加'}查看
+
+ +
+
+ +
+ + +
+ + + + + +
+ + <%--
+ +
--%> + +
+ <%-- --%> + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ <%-- --%> + + + +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+ + +
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp b/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp new file mode 100644 index 000000000..b80f88be9 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp @@ -0,0 +1,91 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + 生效范围配置管理 + + + + +
+ + + + +

+ 生效范围配置管理 +

+ +
+
+
+
+
+ 生效范围配置查看
+
+ +
+ + +
+ + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp b/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp new file mode 100644 index 000000000..4b473a1ef --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp @@ -0,0 +1,139 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +生效范围配置信息 + + + + + + + +
+ + +
+
+
+
+
+ +
+
+
+ +
+ + + +
+ + + + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + +
编码编码对应值描述信息数据类型创建时间操作
${sysDictInfo.itemCode}${sysDictInfo.itemValue}${fns:abbr(sysDictInfo.itemDesc,15)}${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")} + + +
+ 操作 + + +
+ +
+
${page}
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/static/pages/css/dictInfo.css b/src/main/webapp/static/pages/css/dictInfo.css new file mode 100644 index 000000000..98551a010 --- /dev/null +++ b/src/main/webapp/static/pages/css/dictInfo.css @@ -0,0 +1,8 @@ +/*** +sysDict serviceDict +***/ + +.search-lable { +margin-right: 5px; +margin-left: 8px; +}