diff --git a/.tern-project b/.tern-project new file mode 100644 index 000000000..077404aaa --- /dev/null +++ b/.tern-project @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 32a52ffc8..040d53a91 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -260,9 +260,9 @@ public class BaseIpCfg extends BaseCfg { @Override public void initDefaultValue(){ super.initDefaultValue(); - this.srcIp ="0.0.0.0"; +// this.srcIp ="0.0.0.0"; this.srcPortMask = "65535" ; - this.dstIp = "0.0.0.0" ; +// this.dstIp = "0.0.0.0" ; this.dstPortMask = "65535"; this.direction = 0; } diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index 3d2a71d7e..ff87ee0da 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -16,7 +16,7 @@ package com.nis.domain.configuration; * @version V1.0 */ public class ComplexkeywordCfg extends BaseCfg{ - + protected String tableName; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -35,7 +35,7 @@ public class ComplexkeywordCfg extends BaseCfg{ /** * 编译id */ - protected Integer compileId; + protected Long compileId; /** * 表达式类型 */ @@ -81,13 +81,13 @@ public class ComplexkeywordCfg extends BaseCfg{ * @return compileId */ - public Integer getCompileId() { + public Long getCompileId() { return compileId; } /** * @param compileId the compileId to set */ - public void setCompileId(Integer compileId) { + public void setCompileId(Long compileId) { this.compileId = compileId; } /** @@ -97,10 +97,7 @@ public class ComplexkeywordCfg extends BaseCfg{ */ public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; + return this.exprType; } /** * @param exprType the exprType to set @@ -115,10 +112,7 @@ public class ComplexkeywordCfg extends BaseCfg{ */ public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + return this.matchMethod; } /** * @param matchMethod the matchMethod to set @@ -144,10 +138,26 @@ public class ComplexkeywordCfg extends BaseCfg{ * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() */ @Override - protected void initDefaultValue() { + public void initDefaultValue() { // TODO Auto-generated method stub super.initDefaultValue(); + this.exprType=0; this.isHexbin = 0 ; + this.matchMethod=3; + } + /** + * tableName + * @return tableName + */ + + public String getTableName() { + return tableName; + } + /** + * @param tableName the tableName to set + */ + public void setTableName(String tableName) { + this.tableName = tableName; } } diff --git a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java index 2b14ad97e..23cd39a5a 100644 --- a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: DnsDomainConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class DnsDomainCfg extends ComplexkeywordCfg { - public static final String tableName="dns_domain_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -27,41 +24,16 @@ public class DnsDomainCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -2761078174512000577L; - /** - * district - * @return district - */ - - public String getDistrict() { - if(StringUtils.isBlank(district)) - return "QNAME"; - else - return district; - } - /** - * @param district the district to set - */ - public void setDistrict(String district) { - this.district = district; - } /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; + this.district="QNAME"; } } diff --git a/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java b/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java index f03d03e6f..e169f0944 100644 --- a/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpReqHeadCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpReqHeadCfg extends ComplexkeywordCfg { - public static final String tableName="http_req_head_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -25,23 +24,15 @@ public class HttpReqHeadCfg extends ComplexkeywordCfg { private static final long serialVersionUID = 8231984530204284334L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java b/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java index a4c6e535f..7b6b9e05d 100644 --- a/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpResHeadCfg.java @@ -16,7 +16,6 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpResHeadCfg extends ComplexkeywordCfg { - public static final String tableName="http_res_head_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -24,24 +23,17 @@ public class HttpResHeadCfg extends ComplexkeywordCfg { */ private static final long serialVersionUID = 1306491838846197119L; + /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=0; + this.exprType=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java index 5a0bdf53a..5e8f53b54 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailAttachContentConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailAttachContentCfg extends ComplexkeywordCfg { - public static final String tableName="mail_attach_content_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -27,33 +24,16 @@ public class MailAttachContentCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -5535627006599408223L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "AttachContent"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="AttachContent"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java index 183ec9980..dbf221fe8 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailAttachNameConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailAttachNameCfg extends ComplexkeywordCfg { - public static final String tableName="mail_attach_name_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -27,33 +24,16 @@ public class MailAttachNameCfg extends ComplexkeywordCfg { private static final long serialVersionUID = 9067647371707152226L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "AttachName"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="AttachName"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailContentCfg.java b/src/main/java/com/nis/domain/configuration/MailContentCfg.java index 35ab3eee8..386206738 100644 --- a/src/main/java/com/nis/domain/configuration/MailContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailContentCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailContentConfig.java * @Description: TODO @@ -27,33 +25,16 @@ public class MailContentCfg extends ComplexkeywordCfg{ private static final long serialVersionUID = -4257845942210782532L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "Content"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="Content"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailFromCfg.java b/src/main/java/com/nis/domain/configuration/MailFromCfg.java index e2c3d081c..0d12a3115 100644 --- a/src/main/java/com/nis/domain/configuration/MailFromCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailFromCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: MailFromConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class MailFromCfg extends ComplexkeywordCfg { - public static final String tableName="mail_from_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -28,33 +25,16 @@ public class MailFromCfg extends ComplexkeywordCfg { private static final long serialVersionUID = 7605303118334439422L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "From"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 0; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="From"; + this.exprType=0; + this.matchMethod=0; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java index 8a4a7687e..19580cd92 100644 --- a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailSubjectConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailSubjectCfg extends ComplexkeywordCfg { - public static final String tableName="mail_subject_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -27,23 +24,16 @@ public class MailSubjectCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -547690498444330212L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "Subject"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 3; - else - return this.exprType; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="Subject"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/MailToCfg.java b/src/main/java/com/nis/domain/configuration/MailToCfg.java index 25d16bc03..2b27f6f0e 100644 --- a/src/main/java/com/nis/domain/configuration/MailToCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailToCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: MailToConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class MailToCfg extends ComplexkeywordCfg { - public static final String tableName="mail_to_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -28,33 +25,16 @@ public class MailToCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -7755270610917876826L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "To"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="To"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java index 58d983abd..47ecd12d4 100644 --- a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java +++ b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java @@ -44,16 +44,101 @@ public class NumBoundaryCfg extends BaseCfg { * 数值上界 */ protected Integer isHexbin ; + protected Long compileId; /* (non-Javadoc) * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() */ @Override - protected void initDefaultValue() { + public void initDefaultValue() { // TODO Auto-generated method stub super.initDefaultValue(); this.exprType = 3; this.matchMethod = 0; this.isHexbin = 0; } + /** + * lowBounadry + * @return lowBounadry + */ + + public Long getLowBounadry() { + return lowBounadry; + } + /** + * @param lowBounadry the lowBounadry to set + */ + public void setLowBounadry(Long lowBounadry) { + this.lowBounadry = lowBounadry; + } + /** + * upBoundary + * @return upBoundary + */ + + public Long getUpBoundary() { + return upBoundary; + } + /** + * @param upBoundary the upBoundary to set + */ + public void setUpBoundary(Long upBoundary) { + this.upBoundary = upBoundary; + } + /** + * exprType + * @return exprType + */ + + public Integer getExprType() { + return exprType; + } + /** + * @param exprType the exprType to set + */ + public void setExprType(Integer exprType) { + this.exprType = exprType; + } + /** + * matchMethod + * @return matchMethod + */ + + public Integer getMatchMethod() { + return matchMethod; + } + /** + * @param matchMethod the matchMethod to set + */ + public void setMatchMethod(Integer matchMethod) { + this.matchMethod = matchMethod; + } + /** + * isHexbin + * @return isHexbin + */ + + public Integer getIsHexbin() { + return isHexbin; + } + /** + * @param isHexbin the isHexbin to set + */ + public void setIsHexbin(Integer isHexbin) { + this.isHexbin = isHexbin; + } + /** + * compileId + * @return compileId + */ + + public Long getCompileId() { + return compileId; + } + /** + * @param compileId the compileId to set + */ + public void setCompileId(Long compileId) { + this.compileId = compileId; + } } diff --git a/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java b/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java index 464d8ed9d..6c2cdcbff 100644 --- a/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java +++ b/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java @@ -128,19 +128,19 @@ public class ServiceDictInfo extends BaseEntity{ this.endDate = endDate; } @JsonIgnore - public static void sortList(List list, List sourcelist, Long parentId, boolean cascade){ + public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i{ } } } + + @JsonIgnore + public static void checkList(List list,List parentList, List sourcelist, boolean cascade){ + for(ServiceDictInfo serviceUp:parentList){ + list.add(serviceUp); + //判断是否有子节点，有则继续获取子节点 + sortList(list, sourcelist, serviceUp.getServiceDictId(), true); + } + + } + + + //顶层的数量 + + public static Integer topCount(List list,Integer parentId){ + Integer count = 0; + List listTemp = new ArrayList(); + for(ServiceDictInfo serviceDictInfo:list){ + if(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()!=null&&serviceDictInfo.getParent().getServiceDictId()==parentId){ + listTemp.add(serviceDictInfo); + } + } + + return listTemp.size(); + } + + } diff --git a/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java b/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java index ad01022cd..6427c772a 100644 --- a/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipOriginalCfg.java @@ -57,4 +57,17 @@ public class SipOriginalCfg extends ComplexkeywordCfg { else return this.matchMethod; } + /* (non-Javadoc) + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="ORIGINAL_CALL"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; + } + } diff --git a/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java b/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java index ed46d1af5..cbe5220ec 100644 --- a/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java +++ b/src/main/java/com/nis/domain/configuration/SipTerminalCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - /** * @ClassName: SipTerminalConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; * @version V1.0 */ public class SipTerminalCfg extends ComplexkeywordCfg{ - public static final String tableName="sip_terminal_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -28,33 +25,16 @@ public class SipTerminalCfg extends ComplexkeywordCfg{ private static final long serialVersionUID = 7164399463108973251L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "TERMINAL_CALL"; - else - return this.district; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.district="TERMINAL_CALL"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/SslCertCfg.java b/src/main/java/com/nis/domain/configuration/SslCertCfg.java index 7907ce3f2..1c79c03f5 100644 --- a/src/main/java/com/nis/domain/configuration/SslCertCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslCertCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: SslCertConfig.java * @Description: TODO @@ -28,34 +26,16 @@ public class SslCertCfg extends ComplexkeywordCfg{ private static final long serialVersionUID = -6121146112218278084L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "CERT"; + public void initDefaultValue() { // TODO Auto-generated method stub - else - return super.getDistrict(); - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + super.initDefaultValue(); + this.district="CERT"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/domain/configuration/SslSniCfg.java b/src/main/java/com/nis/domain/configuration/SslSniCfg.java index a6bdf5175..2c889e2cd 100644 --- a/src/main/java/com/nis/domain/configuration/SslSniCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslSniCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang.StringUtils; - /** * @ClassName: SslSniConfig.java * @Description: TODO @@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils; * @version V1.0 */ public class SslSniCfg extends ComplexkeywordCfg { - public static final String tableName="ssl_sni_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -27,34 +24,16 @@ public class SslSniCfg extends ComplexkeywordCfg { private static final long serialVersionUID = -6648964841408445457L; /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getDistrict() + * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() */ @Override - public String getDistrict() { - if(StringUtils.isBlank(this.district)) - return "SNI"; + public void initDefaultValue() { // TODO Auto-generated method stub - else - return super.getDistrict(); - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseStringConfig#getExprType() - */ - @Override - public Integer getExprType() { - if(this.exprType==null) - return 0; - else - return this.exprType; - } - /* (non-Javadoc) - * @see com.nis.domain.restful.BaseEnhancedStringConfig#getMatchMethod() - */ - @Override - public Integer getMatchMethod() { - if(this.matchMethod==null) - return 3; - else - return this.matchMethod; + super.initDefaultValue(); + this.district="SNI"; + this.exprType=0; + this.matchMethod=3; + this.isHexbin=0; } + } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 471eadc3c..dd560e564 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.nis.domain.configuration.BaseCfg; import com.nis.util.DateUtils; import com.nis.util.JsonMapper; import com.nis.web.service.ArchiveServcie; @@ -28,13 +27,16 @@ import com.nis.web.service.RoleService; import com.nis.web.service.SystemService; import com.nis.web.service.UserService; import com.nis.web.service.configuration.AppCfgService; +import com.nis.web.service.configuration.ComplexStringCfgService; import com.nis.web.service.configuration.FtpCfgService; import com.nis.web.service.configuration.IpCfgService; import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.MediaCfgService; +import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.RequestInfoService; import com.nis.web.service.configuration.ServiceDictInfoService; import com.nis.web.service.configuration.SslCfgService; +import com.nis.web.service.configuration.StringCfgService; import com.nis.web.service.configuration.SysDictInfoService; import com.nis.web.service.configuration.TunnelCfgService; import com.nis.web.service.configuration.WebCfgService; @@ -110,6 +112,12 @@ public class BaseController { @Autowired protected RequestInfoService requestInfoService; + @Autowired + protected StringCfgService stringCfgService; + @Autowired + protected NumCfgService numCfgService; + @Autowired + protected ComplexStringCfgService complexStringCfgService; /** * 管理基础路径 */ diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java new file mode 100644 index 000000000..57133d029 --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -0,0 +1,371 @@ +package com.nis.web.controller.configuration; + +import java.util.Date; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +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 com.nis.domain.Page; +import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.ComplexkeywordCfg; +import com.nis.domain.configuration.RequestInfo; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.Constants; +import com.nis.web.controller.BaseController; + +/** + * 增强字符串相关配置控制类 + * @author dell + * + */ +@Controller +@RequestMapping("${adminPath}/cfg/complex") +public class ComplexStringCfgController extends BaseController{ + + @RequestMapping(value = {"list"}) + public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + if(cfg!=null){ + Integer serviceId=cfg.getServiceId(); + logger.info("servcice id is "+serviceId); + if(serviceId!=null){ + model.addAttribute("serviceId", serviceId); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + cfg.setTableName(tableName); + Page searchPage=new Page(request, response, 1); + if(pageNo!=null) searchPage.setPageNo(pageNo); + if(pageSize!=null) searchPage.setPageSize(pageSize); + if(cfg.getPage()!=null){ + if(!StringUtils.isBlank(cfg.getPage().getOrderBy())); + searchPage.setOrderBy(cfg.getPage().getOrderBy()); + } + Page page = complexStringCfgService.findPage(searchPage, cfg); + model.addAttribute("page", page); + model.addAttribute("action", cfg.getAction()); + model.addAttribute("tableName", tableName); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); + } + }else{ + logger.error("未获取到正确的serviceId"); + } + } + } + + return "/cfg/complexCfgList"; + } + + + @RequestMapping(value = {"form"}) + public String cfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("serviceId", serviceId); + logger.info("sercice id is "+serviceId); + 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=complexStringCfgService.getClassName(tableName); + logger.info("class name is "+className); + String packageName=ComplexkeywordCfg.class.getPackage().getName(); + try { + //通过反射获得ComplexkeywordCfg的子类的实例，并调用子类的initDefaultValue初始化默认值 + Class clazz=Class.forName(packageName+"."+className); + ComplexkeywordCfg cfg=(ComplexkeywordCfg)clazz.newInstance(); + cfg.setTableName(tableName); + cfg.initDefaultValue(); + cfg.setAction(action); + cfg.setServiceId(serviceId); + model.addAttribute("_cfg", cfg); + model.addAttribute("tableName", tableName); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + // TODO Auto-generated catch block + logger.error("打开新增IP窗口失败",e); + e.printStackTrace(); + } + } + } + }else{ + logger.error("未获取到正确的serviceId"); + } + + return "/cfg/complexCfgForm"; + } + @RequestMapping(value = {"updateForm"}) + public String updateStringCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); + model.addAttribute("tableName", tableName); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + ComplexkeywordCfg searchBean=new ComplexkeywordCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); + model.addAttribute("_cfg", cfg); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + ComplexkeywordCfg searchBean=new ComplexkeywordCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); + model.addAttribute("_cfg", cfg); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + + } + } + }else{ + logger.error("未获取到正确的表名"); + } + + return "/cfg/complexCfgForm"; + } + + /** + * + * addStringCfg(新增IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"saveOrUpdateCfg"}) + public String saveOrUpdateStringCfg(String cfgName,Model model, ComplexkeywordCfg cfg) { + model.addAttribute("cfgName",cfgName); + model.addAttribute("cfgType","complex"); + logger.info("saveOrUpdateStringCfg loaded"); + if(cfg==null){ + logger.error("无法保存空的配置！"); + addMessage(model,"保存失败！"); + }else if(!StringUtils.isBlank(cfg.getTableName())){ + int serviceId=cfg.getServiceId(); + long compileId=getCompileId(cfg); + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(new Date()); + cfg.setIsValid(Constants.VALID_NO); + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setCompileId(compileId); + if(cfg.getCfgId()==null){ + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(new Date()); + complexStringCfgService.addStringCfg(cfg); + }else{ + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + complexStringCfgService.updateStringCfg(cfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",cfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + }else if(cfg.getServiceId()!=null){ + int serviceId=cfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + long compileId=getCompileId(cfg); + cfg.setTableName(tableName); + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(new Date()); + cfg.setIsValid(Constants.VALID_NO); + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setCompileId(compileId); + if(cfg.getCfgId()==null){ + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(new Date()); + complexStringCfgService.addStringCfg(cfg); + }else{ + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + complexStringCfgService.updateStringCfg(cfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",cfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + } + } + }else{ + addMessage(model,"保存失败！"); + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName); + } + + /** + * + * auditStringCfg(审核IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"auditCfg"}) + public String auditStringCfg(String cfgName,ComplexkeywordCfg cfg,Model model) { + model.addAttribute("cfgName", cfgName); + if(cfg==null){ + logger.error("无法审核空的配置！"); + }else if(!StringUtils.isBlank(cfg.getTableName())){ + int audit=complexStringCfgService.getIsAudit(cfg); + if(audit==Constants.AUDIT_YES&&cfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + cfg.setAuditorId(cfg.getCurrentUser().getId()); + cfg.setAuditTime(new Date()); + + if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + cfg.setIsValid(Constants.VALID_NO); + }else if(cfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + cfg.setIsValid(Constants.VALID_YES); + } + int result=complexStringCfgService.auditStringCfg(cfg); + } + + }else if(cfg.getServiceId()!=null){ + int serviceId=cfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + cfg.setTableName(tableName); + int audit=complexStringCfgService.getIsAudit(cfg); + if(audit==Constants.AUDIT_YES&&cfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + cfg.setAuditorId(cfg.getCurrentUser().getId()); + cfg.setAuditTime(new Date()); + + if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + cfg.setIsValid(Constants.VALID_NO); + }else if(cfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + cfg.setIsValid(Constants.VALID_YES); + } + int result=complexStringCfgService.auditStringCfg(cfg); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName; + } + /** + * + * auditStringCfg(删除IP配置，逻辑删除) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"deleteCfg"}) + public String deleteStringCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("cfgType","complex"); + if(!StringUtils.isBlank(tableName)){ + int audit=complexStringCfgService.getIsAudit(tableName,cfgId); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + ComplexkeywordCfg cfg=new ComplexkeywordCfg(); + cfg.setCfgId(cfgId); + cfg.setTableName(tableName); + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + cfg.setIsValid(Constants.VALID_DEL); + int result=complexStringCfgService.deleteStringCfg(cfg); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + ComplexkeywordCfg cfg=new ComplexkeywordCfg(); + cfg.setCfgId(cfgId); + cfg.setTableName(tableName); + int audit=complexStringCfgService.getIsAudit(cfg); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + cfg.setIsValid(Constants.VALID_DEL); + int result=complexStringCfgService.deleteStringCfg(cfg); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage"; + } + /** + * + * getCompileId(获取编译ID) + * (这里描述这个方法适用条件 – 可选) + * @return + *long + * @exception + * @since 1.0.0 + */ + protected long getCompileId(BaseCfg cfg){ + return 0; + } +} diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 40b34c2cd..f3c399778 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -41,12 +41,14 @@ public class IpCfgController extends BaseController{ return "/cfg/ipWhiteForm"; } - @RequestMapping(value = {"ipCfgList"}) + @RequestMapping(value = {"list"}) public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); if(ipCfg!=null){ Integer serviceId=ipCfg.getServiceId(); logger.info("servcice id is "+serviceId); if(serviceId!=null){ + model.addAttribute("serviceId", serviceId); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); @@ -62,9 +64,8 @@ public class IpCfgController extends BaseController{ } Page page = ipCfgService.findPage(searchPage, ipCfg); model.addAttribute("page", page); - model.addAttribute("serviceId", serviceId); - model.addAttribute("cfgName", cfgName); model.addAttribute("action", ipCfg.getAction()); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findFlDict(); @@ -84,8 +85,11 @@ public class IpCfgController extends BaseController{ } - @RequestMapping(value = {"ipCfgForm"}) + @RequestMapping(value = {"form"}) public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); logger.info("sercice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -104,8 +108,8 @@ public class IpCfgController extends BaseController{ ipcfg.initDefaultValue(); ipcfg.setAction(action); ipcfg.setServiceId(serviceId); - model.addAttribute("_ipCfg", ipcfg); - model.addAttribute("cfgName", cfgName); + model.addAttribute("_cfg", ipcfg); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findFlDict(); @@ -127,16 +131,19 @@ public class IpCfgController extends BaseController{ return "/cfg/ipCfgForm"; } - @RequestMapping(value = {"updateIpCfgForm"}) + @RequestMapping(value = {"updateForm"}) public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); BaseIpCfg searchBean=new BaseIpCfg(); searchBean.setCfgId(cfgId); searchBean.setTableName(tableName); BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); - model.addAttribute("_ipCfg", ipCfg); - model.addAttribute("cfgName", cfgName); + model.addAttribute("_cfg", ipCfg); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); @@ -155,8 +162,8 @@ public class IpCfgController extends BaseController{ searchBean.setCfgId(cfgId); searchBean.setTableName(tableName); BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); - model.addAttribute("_ipCfg", ipCfg); - model.addAttribute("cfgName", cfgName); + model.addAttribute("_cfg", ipCfg); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); @@ -184,8 +191,10 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"saveOrUpdateIpCfg"}) + @RequestMapping(value = {"saveOrUpdateCfg"}) public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) { + model.addAttribute("cfgName",cfgName); + model.addAttribute("cfgType", "ip"); logger.info("saveOrUpdateIpCfg loaded"); if(ipCfg==null){ logger.error("无法保存空的配置！"); @@ -193,21 +202,25 @@ public class IpCfgController extends BaseController{ }else if(!StringUtils.isBlank(ipCfg.getTableName())){ int serviceId=ipCfg.getServiceId(); long compileId=getCompileId(ipCfg); - ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); - ipCfg.setCreateTime(new Date()); ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); - if(ipCfg.getCfgId()==null) + if(ipCfg.getCfgId()==null){ + ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); + ipCfg.setCreateTime(new Date()); ipCfgService.addIpCfg(ipCfg); - else + }else{ + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(new Date()); ipCfgService.updateIpCfg(ipCfg); + } model.addAttribute("serviceId",serviceId); model.addAttribute("action",ipCfg.getAction()); - model.addAttribute("cfgName",cfgName); + model.addAttribute("tableName", ipCfg.getTableName()); addMessage(model,"保存成功,正在为您跳转页面..."); }else if(ipCfg.getServiceId()!=null){ int serviceId=ipCfg.getServiceId(); + model.addAttribute("serviceId",serviceId); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); @@ -219,13 +232,17 @@ public class IpCfgController extends BaseController{ ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); - if(ipCfg.getCfgId()==null) + if(ipCfg.getCfgId()==null){ + ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); + ipCfg.setCreateTime(new Date()); ipCfgService.addIpCfg(ipCfg); - else + }else{ + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(new Date()); ipCfgService.updateIpCfg(ipCfg); - model.addAttribute("serviceId",serviceId); + } model.addAttribute("action",ipCfg.getAction()); - model.addAttribute("cfgName",cfgName); + model.addAttribute("tableName", ipCfg.getTableName()); addMessage(model,"保存成功,正在为您跳转页面..."); } } @@ -236,52 +253,6 @@ public class IpCfgController extends BaseController{ return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName="+cfgName); } - /** - * - * updateIpCfg(更新IP配置) - * (这里描述这个方法适用条件 – 可选) - * @return - *String - * @exception - * @since 1.0.0 - */ -// @RequestMapping(value = {"updateIpCfg"}) -// public String updateIpCfg(@ModelAttribute("ipCfg") BaseIpCfg ipCfg) { -// if(ipCfg==null){ -// logger.error("无法修改空的配置！"); -// }else if(!StringUtils.isBlank(ipCfg.getTableName())){ -// int audit=ipCfgService.getIsAudit(ipCfg); -// //审核未通过方可修改 -// if(audit==Constants.AUDIT_NO){ -// ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); -// ipCfg.setEditTime(new Date()); -// int result=ipCfgService.updateIpCfg(ipCfg); -// }else{ -// logger.warn("审核未通过配置方可修改！"); -// } -// }else if(ipCfg.getServiceId()!=null){ -// int serviceId=ipCfg.getServiceId(); -// ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); -// if(serviceConfigInfo!=null){ -// String tableName=serviceConfigInfo.getTableName(); -// if(!StringUtils.isBlank(tableName)){ -// ipCfg.setTableName(tableName); -// int audit=ipCfgService.getIsAudit(ipCfg); -// //审核未通过方可修改 -// if(audit==Constants.AUDIT_NO){ -// ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); -// ipCfg.setEditTime(new Date()); -// int result=ipCfgService.updateIpCfg(ipCfg); -// }else{ -// logger.warn("审核未通过配置方可修改！"); -// } -// } -// } -// }else{ -// logger.error("无法确定IP配置的表名！"); -// } -// return "/cfg/resultPage"; -// } /** * * auditIpCfg(审核IP配置) @@ -291,8 +262,9 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"auditIpCfg"}) + @RequestMapping(value = {"auditCfg"}) public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) { + model.addAttribute("cfgName", cfgName); if(ipCfg==null){ logger.error("无法审核空的配置！"); }else if(!StringUtils.isBlank(ipCfg.getTableName())){ @@ -310,7 +282,6 @@ public class IpCfgController extends BaseController{ } int result=ipCfgService.auditIpCfg(ipCfg); } - }else if(ipCfg.getServiceId()!=null){ int serviceId=ipCfg.getServiceId(); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -331,13 +302,14 @@ public class IpCfgController extends BaseController{ ipCfg.setIsValid(Constants.VALID_YES); } int result=ipCfgService.auditIpCfg(ipCfg); + } } } }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/ip/ipCfgList?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName; + return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName; } /** * @@ -348,8 +320,12 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"deleteIpCfg"}) + @RequestMapping(value = {"deleteCfg"}) public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); + model.addAttribute("cfgType", "ip"); if(!StringUtils.isBlank(tableName)){ int audit=ipCfgService.getIsAudit(tableName,cfgId); //未审核时可删除 @@ -361,9 +337,7 @@ public class IpCfgController extends BaseController{ ipCfg.setEditTime(new Date()); ipCfg.setIsValid(Constants.VALID_DEL); int result=ipCfgService.deleteIpCfg(ipCfg); - model.addAttribute("serviceId", serviceId); - model.addAttribute("cfgName", cfgName); - model.addAttribute("action", action); + model.addAttribute("tableName", tableName); addMessage(model,"删除成功,正在为您跳转页面..."); }else{ logger.error("通过审核的配置不能删除！"); @@ -384,9 +358,7 @@ public class IpCfgController extends BaseController{ ipCfg.setEditTime(new Date()); ipCfg.setIsValid(Constants.VALID_DEL); int result=ipCfgService.deleteIpCfg(ipCfg); - model.addAttribute("serviceId", serviceId); - model.addAttribute("cfgName", cfgName); - model.addAttribute("action", action); + model.addAttribute("tableName", tableName); addMessage(model,"删除成功,正在为您跳转页面..."); }else{ logger.error("通过审核的配置不能删除！"); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java new file mode 100644 index 000000000..a8bba132b --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -0,0 +1,263 @@ +package com.nis.web.controller.configuration; + +import java.util.Date; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +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 com.nis.domain.Page; +import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.NumBoundaryCfg; +import com.nis.domain.configuration.RequestInfo; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.Constants; +import com.nis.web.controller.BaseController; + +/** + * 字符串相关配置控制类 + * @author dell + * + */ +@Controller +@RequestMapping("${adminPath}/cfg/num") +public class NumCfgController extends BaseController{ + + @RequestMapping(value = {"list"}) + public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + if(cfg!=null){ + Integer serviceId=cfg.getServiceId(); + logger.info("servcice id is "+serviceId); + if(serviceId!=null){ + model.addAttribute("serviceId", serviceId); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + Page searchPage=new Page(request, response, 1); + if(pageNo!=null) searchPage.setPageNo(pageNo); + if(pageSize!=null) searchPage.setPageSize(pageSize); + if(cfg.getPage()!=null){ + if(!StringUtils.isBlank(cfg.getPage().getOrderBy())); + searchPage.setOrderBy(cfg.getPage().getOrderBy()); + } + Page page = numCfgService.findPage(searchPage, cfg); + model.addAttribute("page", page); + model.addAttribute("action", cfg.getAction()); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); + }else{ + logger.error("未获取到正确的serviceId"); + } + } + } + + return "/cfg/numCfgList"; + } + + + @RequestMapping(value = {"form"}) + public String cfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("serviceId", serviceId); + logger.info("sercice id is "+serviceId); + if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + NumBoundaryCfg cfg=new NumBoundaryCfg(); + cfg.initDefaultValue(); + cfg.setAction(action); + cfg.setServiceId(serviceId); + model.addAttribute("_cfg", cfg); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); + } + }else{ + logger.error("未获取到正确的serviceId"); + } + + return "/cfg/numCfgForm"; + } + @RequestMapping(value = {"updateForm"}) + public String updateStringCfgForm(int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); + if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + NumBoundaryCfg searchBean=new NumBoundaryCfg(); + searchBean.setCfgId(cfgId); + NumBoundaryCfg cfg=numCfgService.getNumCfgById(searchBean); + model.addAttribute("_cfg", cfg); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + + } + }else{ + logger.error("未获取到正确的表名"); + } + + return "/cfg/numCfgForm"; + } + + /** + * + * addStringCfg(新增IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"saveOrUpdateCfg"}) + public String saveOrUpdateStringCfg(String cfgName,Model model, NumBoundaryCfg cfg) { + model.addAttribute("cfgName",cfgName); + model.addAttribute("cfgType","num"); + logger.info("saveOrUpdateStringCfg loaded"); + if(cfg==null){ + logger.error("无法保存空的配置！"); + addMessage(model,"保存失败！"); + }else if(cfg.getServiceId()!=null){ + int serviceId=cfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + long compileId=getCompileId(cfg); + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(new Date()); + cfg.setIsValid(Constants.VALID_NO); + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setCompileId(compileId); + if(cfg.getCfgId()==null){ + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(new Date()); + numCfgService.addNumCfg(cfg); + }else{ + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + numCfgService.updateNumCfg(cfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",cfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + } + }else{ + addMessage(model,"保存失败！"); + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName); + } + + /** + * + * auditStringCfg(审核IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"auditCfg"}) + public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) { + model.addAttribute("cfgName", cfgName); + if(cfg==null){ + logger.error("无法审核空的配置！"); + }else if(cfg.getServiceId()!=null){ + int serviceId=cfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + int audit=numCfgService.getIsAudit(cfg); + if(audit==Constants.AUDIT_YES&&cfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + cfg.setAuditorId(cfg.getCurrentUser().getId()); + cfg.setAuditTime(new Date()); + + if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + cfg.setIsValid(Constants.VALID_NO); + }else if(cfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + cfg.setIsValid(Constants.VALID_YES); + } + int result=numCfgService.auditNumCfg(cfg); + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName; + } + /** + * + * auditStringCfg(删除IP配置，逻辑删除) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"deleteCfg"}) + public String deleteStringCfg(int action,long cfgId,String cfgName,Integer serviceId,Model model) { + model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("cfgType","num"); + if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + NumBoundaryCfg cfg=new NumBoundaryCfg(); + cfg.setCfgId(cfgId); + int audit=numCfgService.getIsAudit(cfg); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + cfg.setIsValid(Constants.VALID_DEL); + int result=numCfgService.deleteNumCfg(cfg); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage"; + } + /** + * + * getCompileId(获取编译ID) + * (这里描述这个方法适用条件 – 可选) + * @return + *long + * @exception + * @since 1.0.0 + */ + protected long getCompileId(BaseCfg cfg){ + return 0; + } +} diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index 1aab4a8bd..a43656ba0 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -12,6 +12,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.configuration.RequestInfo; +import com.nis.util.Constants; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; import com.nis.web.service.configuration.RequestInfoService; @@ -58,18 +59,22 @@ public class RequestInfoController extends BaseController{ try { if(requestInfo.getId()!=null){ // 保存用户信息 + logger.info(requestInfo.getId()+"修改成功"); requestInfoService.saveOrUpdate(requestInfo); addMessage(redirectAttributes, "success"); }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ + logger.info(requestInfo.getRequestNumber()+"重复数据"); addMessage(model, "error"); return form(requestInfo, model); } // 保存用户信息 requestInfoService.saveOrUpdate(requestInfo); addMessage(redirectAttributes, "success"); + logger.info(requestInfo.getId()+"保存成功"); } } catch (Exception e) { + logger.error(e.getMessage()); e.printStackTrace(); addMessage(model, "error"); } @@ -95,8 +100,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "requestExamine") - public String requestExamine(RequestInfo requestInfo, Model model){ + public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ requestInfoService.requestExamine(requestInfo); + addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -107,8 +113,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "requestCancelExamine") - public String requestCancelExamine(RequestInfo requestInfo, Model model){ + public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ requestInfoService.requestCancelExamine(requestInfo); + addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -119,8 +126,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "delete") - public String delete(RequestInfo requestInfo, Model model){ + public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ requestInfoService.delete(requestInfo); + addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } diff --git a/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java index 1b0f17756..0a54cee6c 100644 --- a/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java @@ -18,8 +18,6 @@ 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; @@ -58,7 +56,7 @@ public class ServiceDictInfoController extends BaseController { /** - * 查询业务辅助表-业务字典信息列表 + * 查询业务辅助表-业务字典信息列表(无条件分页查询) * @param serviceDictInfo * @param request * @param response @@ -68,13 +66,66 @@ public class ServiceDictInfoController extends BaseController { @RequiresPermissions("sys:dict:view") @RequestMapping(value = {"list", ""}) public String list(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + //查出顶层分页数据 + Page page = serviceDictInfoService.findTopDictList(new Page(request, response), serviceDictInfo); + model.addAttribute("page", page); + //查出所有数据 + List allList = serviceDictInfoService.findAllDictList(); + //处理数据，保留顶层中的所有下层数据 + List list = Lists.newArrayList(); + boolean flag = false; + for(int i=allList.size()-1;i>=0;i--){ + ServiceDictInfo temp = allList.get(i); + if(temp.getParent()!=null&&temp.getParent().getServiceDictId()!=null&&temp.getParent().getServiceDictId()==0){ + for(ServiceDictInfo topTemp:page.getList()){ + if(temp.getServiceDictId()==topTemp.getServiceDictId()){ + flag = true; + break; + } + } + if(!flag){ + allList.remove(temp); + flag=false; + }else{ + flag=false; + } + } + + } - Page page = serviceDictInfoService.findDictList(new Page(request, response), serviceDictInfo); - model.addAttribute("page", page); - + ServiceDictInfo.sortList(list,allList,0,true); + //ServiceDictInfo.sortList(list, allList, 0, true); + model.addAttribute("list", list); return "/cfg/serviceDictList"; } + + /** + * 查询业务辅助表-业务字典信息列表(含条件查询) + * @param serviceDictInfo + * @param request + * @param response + * @param model + * @return + */ + @RequiresPermissions("sys:dict:view") + @RequestMapping(value = {"searchList"}) + public String searchList(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + if(StringUtils.strIsBlank(serviceDictInfo.getItemValue()) + &&serviceDictInfo.getItemCode()==null + &&serviceDictInfo.getItemType()==null + &&serviceDictInfo.getBeginDate()==null + &&serviceDictInfo.getEditTime()==null){ + + return "redirect:"+ adminPath + "/configuration/serviceDictInfo/list"; + } + Page page = serviceDictInfoService.findDictSearchList(new Page(request, response), serviceDictInfo); + model.addAttribute("page", page); + + return "/cfg/serviceDictInfoSearchList"; + } + + /** * 进入添加或修改页面 * @param serviceDictInfo @@ -86,6 +137,13 @@ public class ServiceDictInfoController extends BaseController { if(doAction!=null&&doAction.equals("0")){ return "/cfg/serviceDictInfo"; } + if (serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getId() == null) { + ServiceDictInfo parent = new ServiceDictInfo(); + parent.setServiceDictId(0); + serviceDictInfo.setParent(parent); + } + model.addAttribute("serviceDictInfo", serviceDictInfo); + return "/cfg/serviceDictForm"; } /** @@ -106,13 +164,17 @@ public class ServiceDictInfoController extends BaseController { e.printStackTrace(); addMessage(redirectAttributes, "保存配置失败！"); } + if(serviceDictInfo.getItemType()==3){ + return "redirect:" + adminPath + "/configuration/serviceDictInfo/markList"; + }else{ + return "redirect:" + adminPath + "/configuration/serviceDictInfo/list"; + } - return "redirect:" + adminPath + "/configuration/serviceDictInfo/list"; } /** - * 删除 + * 删除(删除时删除所有下级菜单) * @param serviceDictInfo * @param model * @return @@ -142,11 +204,12 @@ public class ServiceDictInfoController extends BaseController { @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(); + //找出所有的非叶子配置 + List list = serviceDictInfoService.findAllNoLeafDictList(); for (int i=0; i map = Maps.newHashMap(); @@ -178,12 +241,19 @@ public class ServiceDictInfoController extends BaseController { if(doAction!=null&&doAction.equals("0")){ return "/cfg/serviceDictMarkInfo"; } + if (serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getId() == null) { + ServiceDictInfo parent = new ServiceDictInfo(); + parent.setServiceDictId(0); + serviceDictInfo.setParent(parent); + } + model.addAttribute("serviceDictInfo", serviceDictInfo); + return "/cfg/serviceDictMarkForm"; } /** - * 查询业务辅助表-业务字典信息列表 + * 查询标签列表(无条件分页查询) * @param serviceDictInfo * @param request * @param response @@ -191,15 +261,67 @@ public class ServiceDictInfoController extends BaseController { * @return */ @RequiresPermissions("sys:dict:view") - @RequestMapping(value = {"markList"}) + @RequestMapping(value = {"markList", ""}) public String markList(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + //查出顶层分页数据 + Page page = serviceDictInfoService.findTopDictMarkList(new Page(request, response), serviceDictInfo); + model.addAttribute("page", page); + //查出所有数据 + List allList = serviceDictInfoService.findAllDictMarkList(); + //处理数据，保留顶层中的所有下层数据 + List list = Lists.newArrayList(); + boolean flag = false; + for(int i=allList.size()-1;i>=0;i--){ + ServiceDictInfo temp = allList.get(i); + if(temp.getParent()!=null&&temp.getParent().getServiceDictId()!=null&&temp.getParent().getServiceDictId()==0){ + for(ServiceDictInfo topTemp:page.getList()){ + if(temp.getServiceDictId()==topTemp.getServiceDictId()){ + flag = true; + break; + } + } + if(!flag){ + allList.remove(temp); + flag=false; + }else{ + flag=false; + } + } + + } - Page page = serviceDictInfoService.findDictMarkList(new Page(request, response), serviceDictInfo); - model.addAttribute("page", page); - + ServiceDictInfo.sortList(list,allList,0,true); + //ServiceDictInfo.sortList(list, allList, 0, true); + model.addAttribute("list", list); return "/cfg/serviceDictMarkList"; } + /** + * 查询业务辅助表-业务字典信息列表(含条件查询) + * @param serviceDictInfo + * @param request + * @param response + * @param model + * @return + */ + @RequiresPermissions("sys:dict:view") + @RequestMapping(value = {"searchMarkList"}) + public String searchMarkList(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { + if(StringUtils.strIsBlank(serviceDictInfo.getItemValue()) + &&serviceDictInfo.getItemCode()==null + &&serviceDictInfo.getItemType()==null + &&serviceDictInfo.getBeginDate()==null + &&serviceDictInfo.getEditTime()==null){ + + return "redirect:"+ adminPath + "/configuration/serviceDictInfo/markList"; + } + Page page = serviceDictInfoService.findDictSearchMarkList(new Page(request, response), serviceDictInfo); + model.addAttribute("page", page); + + return "/cfg/serviceDictInfoSearchMarkList"; + } + + /** * 新增或修改 @@ -242,4 +364,34 @@ public class ServiceDictInfoController extends BaseController { return "redirect:" + adminPath + "/configuration/serviceDictInfo/markList"; } + /** + * isShowHide是否显示隐藏菜单 + * @param extId + * @param isShowHidden + * @param response + * @return + */ + @RequiresPermissions("user") + @ResponseBody + @RequestMapping(value = "treeMarkData") + public List> treeMarkData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response) { + List> mapList = Lists.newArrayList(); + //找出所有的非叶子配置 + List list = serviceDictInfoService.findAllNoLeafDictMarkList(); + 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; + } + } diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java new file mode 100644 index 000000000..33ad236ec --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -0,0 +1,371 @@ +package com.nis.web.controller.configuration; + +import java.util.Date; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +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 com.nis.domain.Page; +import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.RequestInfo; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.Constants; +import com.nis.web.controller.BaseController; + +/** + * 字符串相关配置控制类 + * @author dell + * + */ +@Controller +@RequestMapping("${adminPath}/cfg/string") +public class StringCfgController extends BaseController{ + + @RequestMapping(value = {"list"}) + public String stringCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + if(stringCfg!=null){ + Integer serviceId=stringCfg.getServiceId(); + logger.info("servcice id is "+serviceId); + if(serviceId!=null){ + model.addAttribute("serviceId", serviceId); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + stringCfg.setTableName(tableName); + Page searchPage=new Page(request, response, 1); + if(pageNo!=null) searchPage.setPageNo(pageNo); + if(pageSize!=null) searchPage.setPageSize(pageSize); + if(stringCfg.getPage()!=null){ + if(!StringUtils.isBlank(stringCfg.getPage().getOrderBy())); + searchPage.setOrderBy(stringCfg.getPage().getOrderBy()); + } + Page page = stringCfgService.findPage(searchPage, stringCfg); + model.addAttribute("page", page); + model.addAttribute("action", stringCfg.getAction()); + model.addAttribute("tableName", tableName); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); + } + }else{ + logger.error("未获取到正确的serviceId"); + } + } + } + + return "/cfg/stringCfgList"; + } + + + @RequestMapping(value = {"form"}) + public String stringCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("serviceId", serviceId); + logger.info("sercice id is "+serviceId); + 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=stringCfgService.getClassName(tableName); + logger.info("class name is "+className); + String packageName=BaseStringCfg.class.getPackage().getName(); + try { + //通过反射获得BaseStringCfg的子类的实例，并调用子类的initDefaultValue初始化默认值 + Class clazz=Class.forName(packageName+"."+className); + BaseStringCfg stringcfg=(BaseStringCfg)clazz.newInstance(); + stringcfg.setTableName(tableName); + stringcfg.initDefaultValue(); + stringcfg.setAction(action); + stringcfg.setServiceId(serviceId); + model.addAttribute("_cfg", stringcfg); + model.addAttribute("tableName", tableName); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + // TODO Auto-generated catch block + logger.error("打开新增IP窗口失败",e); + e.printStackTrace(); + } + } + } + }else{ + logger.error("未获取到正确的serviceId"); + } + + return "/cfg/stringCfgForm"; + } + @RequestMapping(value = {"updateForm"}) + public String updateStringCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); + model.addAttribute("tableName", tableName); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + BaseStringCfg searchBean=new BaseStringCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); + model.addAttribute("_cfg", stringCfg); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + BaseStringCfg searchBean=new BaseStringCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); + model.addAttribute("_cfg", stringCfg); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + + } + } + }else{ + logger.error("未获取到正确的表名"); + } + + return "/cfg/stringCfgForm"; + } + + /** + * + * addStringCfg(新增IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"saveOrUpdateCfg"}) + public String saveOrUpdateStringCfg(String cfgName,Model model, BaseStringCfg stringCfg) { + model.addAttribute("cfgName",cfgName); + model.addAttribute("cfgType","string"); + logger.info("saveOrUpdateStringCfg loaded"); + if(stringCfg==null){ + logger.error("无法保存空的配置！"); + addMessage(model,"保存失败！"); + }else if(!StringUtils.isBlank(stringCfg.getTableName())){ + int serviceId=stringCfg.getServiceId(); + long compileId=getCompileId(stringCfg); + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfg.setIsValid(Constants.VALID_NO); + stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); + stringCfg.setCompileId(compileId); + if(stringCfg.getCfgId()==null){ + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfgService.addStringCfg(stringCfg); + }else{ + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfgService.updateStringCfg(stringCfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",stringCfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + }else if(stringCfg.getServiceId()!=null){ + int serviceId=stringCfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + long compileId=getCompileId(stringCfg); + stringCfg.setTableName(tableName); + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfg.setIsValid(Constants.VALID_NO); + stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); + stringCfg.setCompileId(compileId); + if(stringCfg.getCfgId()==null){ + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfgService.addStringCfg(stringCfg); + }else{ + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfgService.updateStringCfg(stringCfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",stringCfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + } + } + }else{ + addMessage(model,"保存失败！"); + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName="+cfgName); + } + + /** + * + * auditStringCfg(审核IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"auditCfg"}) + public String auditStringCfg(String cfgName,BaseStringCfg stringCfg,Model model) { + model.addAttribute("cfgName", cfgName); + if(stringCfg==null){ + logger.error("无法审核空的配置！"); + }else if(!StringUtils.isBlank(stringCfg.getTableName())){ + int audit=stringCfgService.getIsAudit(stringCfg); + if(audit==Constants.AUDIT_YES&&stringCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + stringCfg.setAuditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setAuditTime(new Date()); + + if(stringCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + stringCfg.setIsValid(Constants.VALID_NO); + }else if(stringCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + stringCfg.setIsValid(Constants.VALID_YES); + } + int result=stringCfgService.auditStringCfg(stringCfg); + } + + }else if(stringCfg.getServiceId()!=null){ + int serviceId=stringCfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + stringCfg.setTableName(tableName); + int audit=stringCfgService.getIsAudit(stringCfg); + if(audit==Constants.AUDIT_YES&&stringCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + stringCfg.setAuditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setAuditTime(new Date()); + + if(stringCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + stringCfg.setIsValid(Constants.VALID_NO); + }else if(stringCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + stringCfg.setIsValid(Constants.VALID_YES); + } + int result=stringCfgService.auditStringCfg(stringCfg); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName"+cfgName; + } + /** + * + * auditStringCfg(删除IP配置，逻辑删除) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"deleteCfg"}) + public String deleteStringCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("cfgType","string"); + if(!StringUtils.isBlank(tableName)){ + int audit=stringCfgService.getIsAudit(tableName,cfgId); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + BaseStringCfg stringCfg=new BaseStringCfg(); + stringCfg.setCfgId(cfgId); + stringCfg.setTableName(tableName); + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfg.setIsValid(Constants.VALID_DEL); + int result=stringCfgService.deleteStringCfg(stringCfg); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + BaseStringCfg stringCfg=new BaseStringCfg(); + stringCfg.setCfgId(cfgId); + stringCfg.setTableName(tableName); + int audit=stringCfgService.getIsAudit(stringCfg); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfg.setIsValid(Constants.VALID_DEL); + int result=stringCfgService.deleteStringCfg(stringCfg); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage"; + } + /** + * + * getCompileId(获取编译ID) + * (这里描述这个方法适用条件 – 可选) + * @return + *long + * @exception + * @since 1.0.0 + */ + protected long getCompileId(BaseCfg cfg){ + return 0; + } +} diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.java b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.java new file mode 100644 index 000000000..8d1b2b608 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.java @@ -0,0 +1,29 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.ComplexkeywordCfg; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +/** + * IP相关配置数据处理类 + * @author dell + * + */ +@MyBatisDao +public interface ComplexStringCfgDao extends CrudDao{ + public ComplexkeywordCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; + public ComplexkeywordCfg get(ComplexkeywordCfg entity) ; + public List findList(ComplexkeywordCfg entity) ; + public int insert(ComplexkeywordCfg entity) ; + public int updateByPrimaryKeySelective(ComplexkeywordCfg entity) ; + public int updateValid(ComplexkeywordCfg entity) ; + public int audit(ComplexkeywordCfg entity) ; + public int getIsValid(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsValid(ComplexkeywordCfg entity); + public int getIsAudit(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsAudit(ComplexkeywordCfg entity); +} diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml new file mode 100644 index 000000000..8a0811a3d --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFG_ID, CFG_DESC,DISTRICT, KEYWORDS,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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.DISTRICT as district, r.KEYWORDS as keywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + + CFG_DESC,DISTRICT,KEYWORDS, 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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,AREA_EFFECTIVE_IDS + + + #{cfgDesc,jdbcType=VARCHAR},#{district,jdbcType=VARCHAR},#{keywords,jdbcType=VARCHAR},#{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}, + #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR} + + + + + + + + SELECT LAST_INSERT_ID() + + insert into ${tableName} ( + + )values ( + + ) + + + update ${tableName} + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + district = #{district,jdbcType=VARCHAR}, + + + keywords = #{keywords,jdbcType=VARCHAR}, + + + 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}, + + + expr_type=#{exprType,jdbcType=INTEGER}, + + + match_method=#{matchMethod,jdbcType=INTEGER}, + + + is_hexbin=#{isHexbin,jdbcType=INTEGER}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT} + + + update ${tableName} set is_audit = #{isAudit,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER}, audit_time = #{auditTime,jdbcType=TIMESTAMP} + + ,is_valid = #{isValid,jdbcType=INTEGER} + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 08dfd203f..23229f419 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -93,7 +93,7 @@ ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS - r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.IP_TYPE as ipType, r.SRC_IP as scrIp, r.SRC_IP_MASK as srcIpMask, r.SRC_PORT as srcPort, + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.IP_TYPE as ipType, r.SRC_IP as srcIp, r.SRC_IP_MASK as srcIpMask, r.SRC_PORT as srcPort, r.SRC_PORT_MASK as srcPortMask ,r.DST_IP as dstIp,r.DST_IP_MASK as dstIpMask, r.DST_PORT as dstPort, r.DST_PORT_MASK as dstPortMask, r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, @@ -244,8 +244,8 @@ from ${tableName} r left join sys_user s on r.creator_id=s.id - left join sys_user u on r.editor_id=u.id - left join sys_user e on r.auditor_id=e.id + left join sys_user e on r.editor_id=e.id + left join sys_user u on r.auditor_id=u.id left join request_info ri on r.request_id=ri.id left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_valid=1 and sdic.is_leaf=0 left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_valid=1 and sdia.is_leaf=0 diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.java b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.java new file mode 100644 index 000000000..2d79f65b3 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.java @@ -0,0 +1,29 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.NumBoundaryCfg; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +/** + * IP相关配置数据处理类 + * @author dell + * + */ +@MyBatisDao +public interface NumCfgDao extends CrudDao{ + public NumBoundaryCfg getById(@Param("cfgId")Long id) ; + public NumBoundaryCfg get(NumBoundaryCfg entity) ; + public List findList(NumBoundaryCfg entity) ; + public int insert(NumBoundaryCfg entity) ; + public int updateByPrimaryKeySelective(NumBoundaryCfg entity) ; + public int updateValid(NumBoundaryCfg entity) ; + public int audit(NumBoundaryCfg entity) ; + public int getIsValid(@Param("cfgId")Long id); + public int getIsValid(NumBoundaryCfg entity); + public int getIsAudit(@Param("cfgId")Long id); + public int getIsAudit(NumBoundaryCfg entity); +} diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml new file mode 100644 index 000000000..efa6919be --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml @@ -0,0 +1,397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFG_ID, CFG_DESC, LOW_BOUNADRY,UP_BOUNADRY,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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.LOW_BOUNADRY as lowBounadry,r.UP_BOUNADRY as upBounadry, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + + CFG_DESC, LOW_BOUNADRY,UP_BOUNADRY, 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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,AREA_EFFECTIVE_IDS + + + #{cfgDesc,jdbcType=VARCHAR},#{lowBounadry,jdbcType=BIGINT},#{upBounadry,jdbcType=BIGINT},#{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}, + #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR} + + + + + + + + SELECT LAST_INSERT_ID() + + insert into num_boundary_cfg ( + + )values ( + + ) + + + update num_boundary_cfg + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + low_bounadry = #{lowBounadry,jdbcType=BIGINT}, + + + up_Bounadry = #{upBounadry,jdbcType=BIGINT}, + + + 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}, + + + expr_type=#{exprType,jdbcType=INTEGER}, + + + match_method=#{matchMethod,jdbcType=INTEGER}, + + + is_hexbin=#{isHexbin,jdbcType=INTEGER}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + update NUM_BOUNDARY_CFG set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT} + + + update NUM_BOUNDARY_CFG set is_audit = #{isAudit,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER}, audit_time = #{auditTime,jdbcType=TIMESTAMP} + + ,is_valid = #{isValid,jdbcType=INTEGER} + + 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 index af714deae..31760377a 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; +import com.nis.domain.SysMenu; import com.nis.domain.configuration.ServiceDictInfo; import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; @@ -12,18 +13,25 @@ import com.nis.web.dao.MyBatisDao; public interface ServiceDictInfoDao extends CrudDao { /** - * 查询分类性质字典列表， + * 查询分类性质顶层字典列表（无条件查询） * @param serviceDictInfo * @return */ - List findDictList(ServiceDictInfo serviceDictInfo); - + List findTopDictList(ServiceDictInfo serviceDictInfo); /** - * 查询标签字典列表 + * 查出所有分类性质 + */ + List findAllDictList(ServiceDictInfo serviceDictInfo); + /** + * 查询所有的非叶子配置 + */ + List findAllNoLeafDictList(); + /** + * 查询分类性质字典列表（含条件查询） * @param serviceDictInfo * @return */ - List findDictMarkList(ServiceDictInfo serviceDictInfo); + List findDictSearchList(ServiceDictInfo serviceDictInfo); /** @@ -39,14 +47,40 @@ public interface ServiceDictInfoDao extends CrudDao { */ ServiceDictInfo getDictById(Integer serviceDictId); - /** - * 查询所有非叶子节点字典配置信息 - * @return - */ - List findAllDict(); + + //标签管理 + /** + * 查询标签顶层字典列表（无条件查询） + * @param serviceDictInfo + * @return + */ + List findTopDictMarkList(ServiceDictInfo serviceDictInfo); + /** + * 查出所有标签 + */ + List findAllDictMarkList(ServiceDictInfo serviceDictInfo); + /** + * 查询标签字典列表（条件查询） + * @param serviceDictInfo + * @return + */ + List findDictSearchMarkList(ServiceDictInfo serviceDictInfo); + /** + * 查询所有的非叶子配置 + * @return + */ + List findAllNoLeafDictMarkList(); + List findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid); List findAllItemDict(@Param("itemType")int itemType); + + + + + + + diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml index c06339474..3e207f2c6 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml @@ -52,12 +52,12 @@ - - + SELECT * FROM service_dict_info WHERE is_valid=1 AND item_type ]]> 3 AND parent_id = 0 - AND item_type like '%${itemType}%' + AND item_value like '%${itemValue}%' AND item_code like '%${itemCode}%' @@ -81,8 +81,110 @@ - - + SELECT * FROM service_dict_info WHERE is_valid=1 AND item_type = 3 AND parent_id = 0 + + + AND item_value like '%${itemValue}%' + + + AND item_code like '%${itemCode}%' + + + + AND create_time >= #{beginDate,jdbcType=TIMESTAMP} + + + AND create_time <= #{endDate,jdbcType=TIMESTAMP} + + + + + ORDER BY ${page.orderBy} + + + ORDER BY create_time desc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java new file mode 100644 index 000000000..284765c03 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java @@ -0,0 +1,29 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +/** + * IP相关配置数据处理类 + * @author dell + * + */ +@MyBatisDao +public interface StringCfgDao extends CrudDao{ + public BaseStringCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; + public BaseStringCfg get(BaseStringCfg entity) ; + public List findList(BaseStringCfg entity) ; + public int insert(BaseStringCfg entity) ; + public int updateByPrimaryKeySelective(BaseStringCfg entity) ; + public int updateValid(BaseStringCfg entity) ; + public int audit(BaseStringCfg entity) ; + public int getIsValid(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsValid(BaseStringCfg entity); + public int getIsAudit(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsAudit(BaseStringCfg entity); +} diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml new file mode 100644 index 000000000..1d012d1be --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFG_ID, CFG_DESC, CFG_KEYWORDS,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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + + CFG_DESC, CFG_KEYWORDS, 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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,AREA_EFFECTIVE_IDS + + + #{cfgDesc,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},#{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}, + #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR} + + + + + + + + SELECT LAST_INSERT_ID() + + insert into ${tableName} ( + + )values ( + + ) + + + update ${tableName} + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR}, + + + 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}, + + + expr_type=#{exprType,jdbcType=INTEGER}, + + + match_method=#{matchMethod,jdbcType=INTEGER}, + + + is_hexbin=#{isHexbin,jdbcType=INTEGER}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT} + + + update ${tableName} set is_audit = #{isAudit,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER}, audit_time = #{auditTime,jdbcType=TIMESTAMP} + + ,is_valid = #{isValid,jdbcType=INTEGER} + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java b/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java new file mode 100644 index 000000000..b9af64270 --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java @@ -0,0 +1,190 @@ +package com.nis.web.service.configuration; + +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.configuration.ComplexkeywordCfg; +import com.nis.web.dao.configuration.ComplexStringCfgDao; +import com.nis.web.service.CrudService; + +/** + * String相关配置事务类 + * @author dell + * + */ +@Service +public class ComplexStringCfgService extends CrudService { + @Autowired + protected ComplexStringCfgDao complexStringCfgDao; + /** + * + * addStringCfg(新增IP类配置) + * (继承ComplexkeywordCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int addStringCfg(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.insert(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + cfg.setTableName(tableName); + logger.info("save "+tableName); + return complexStringCfgDao.insert(cfg); + } + + } + /** + * + * updateStringCfg(更新IP类配置) + * (继承ComplexkeywordCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int updateStringCfg(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.updateByPrimaryKeySelective(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + cfg.setTableName(tableName); + logger.info("update "+tableName); + return complexStringCfgDao.updateByPrimaryKeySelective(cfg); + } + + } + /** + * + * auditStringCfg(审核IP类配置) + * (继承ComplexkeywordCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int auditStringCfg(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.audit(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + cfg.setTableName(tableName); + logger.info("aduit "+tableName); + return complexStringCfgDao.audit(cfg); + } + + } + /** + * + * deleteStringCfg(删除IP类配置) + * (继承ComplexkeywordCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int deleteStringCfg(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.updateValid(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + cfg.setTableName(tableName); + logger.info("delete "+tableName); + return complexStringCfgDao.updateValid(cfg); + } + + } + /** + * + * getStringCfg(根据IP与类名获取IP配置) + * (继承ComplexkeywordCfg这个类方可使用) + * @param clazz + * @param id + * @return + *ComplexkeywordCfg + * @exception + * @since 1.0.0 + */ + public ComplexkeywordCfg getStringCfgById(Class clazz,long id){ + String tableName=getTableName(clazz.getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + logger.info("get "+tableName); + return complexStringCfgDao.getById(tableName, id); + } + /** + * + * getStringCfg(根据IP与类名获取IP配置) + * (继承ComplexkeywordCfg这个类方可使用) + * @param clazz + * @param id + * @return + *ComplexkeywordCfg + * @exception + * @since 1.0.0 + */ + public ComplexkeywordCfg getStringCfgById(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.get(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + cfg.setTableName(tableName); + logger.info("get "+tableName); + return complexStringCfgDao.get(cfg); + } + + } + public Integer getIsValid(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.getIsValid(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + cfg.setTableName(tableName); + return complexStringCfgDao.getIsValid(cfg); + } + + } + public Integer getIsValid(String tableName, long id){ + return complexStringCfgDao.getIsValid(tableName,id); + } + public Integer getIsAudit(ComplexkeywordCfg cfg){ + if(!StringUtils.isBlank(cfg.getTableName())){ + return complexStringCfgDao.getIsAudit(cfg); + }else{ + String tableName=getTableName(cfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + cfg.setTableName(tableName); + return complexStringCfgDao.getIsAudit(cfg); + } + + } + public Integer getIsAudit(String tableName, long id){ + return complexStringCfgDao.getIsAudit(tableName,id); + } +} diff --git a/src/main/java/com/nis/web/service/configuration/NumCfgService.java b/src/main/java/com/nis/web/service/configuration/NumCfgService.java new file mode 100644 index 000000000..5187b1209 --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/NumCfgService.java @@ -0,0 +1,117 @@ +package com.nis.web.service.configuration; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.configuration.NumBoundaryCfg; +import com.nis.web.dao.configuration.NumCfgDao; +import com.nis.web.service.CrudService; + +/** + * Num相关配置事务类 + * @author dell + * + */ +@Service +public class NumCfgService extends CrudService { + @Autowired + protected NumCfgDao numCfgDao; + /** + * + * addNumCfg(新增IP类配置) + * (继承NumBoundaryCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int addNumCfg(NumBoundaryCfg cfg){ + return numCfgDao.insert(cfg); + } + /** + * + * updateNumCfg(更新IP类配置) + * (继承NumBoundaryCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int updateNumCfg(NumBoundaryCfg cfg){ + return numCfgDao.updateByPrimaryKeySelective(cfg); + } + /** + * + * auditNumCfg(审核IP类配置) + * (继承NumBoundaryCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int auditNumCfg(NumBoundaryCfg cfg){ + return numCfgDao.audit(cfg); + } + /** + * + * deleteNumCfg(删除IP类配置) + * (继承NumBoundaryCfg这个类方可使用) + * @param cfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int deleteNumCfg(NumBoundaryCfg cfg){ + return numCfgDao.updateValid(cfg); + } + /** + * + * getNumCfg(根据IP与类名获取IP配置) + * (继承NumBoundaryCfg这个类方可使用) + * @param clazz + * @param id + * @return + *NumBoundaryCfg + * @exception + * @since 1.0.0 + */ + public NumBoundaryCfg getNumCfgById(long id){ + return numCfgDao.getById(id); + } + /** + * + * getNumCfg(根据IP与类名获取IP配置) + * (继承NumBoundaryCfg这个类方可使用) + * @param clazz + * @param id + * @return + *NumBoundaryCfg + * @exception + * @since 1.0.0 + */ + public NumBoundaryCfg getNumCfgById(NumBoundaryCfg cfg){ + return numCfgDao.get(cfg); + } + public Integer getIsValid(NumBoundaryCfg cfg){ + return numCfgDao.getIsValid(cfg); + } + public Integer getIsValid(long id){ + return numCfgDao.getIsValid(id); + } + public Integer getIsAudit(NumBoundaryCfg cfg){ + return numCfgDao.getIsAudit(cfg); + } + public Integer getIsAudit(long id){ + return numCfgDao.getIsAudit(id); + } +} diff --git a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java index 0cfe52330..01ef35013 100644 --- a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import com.google.common.collect.Lists; import com.nis.domain.Page; +import com.nis.domain.SysMenu; import com.nis.domain.SysUser; import com.nis.domain.configuration.ServiceDictInfo; import com.nis.util.Constants; @@ -23,40 +24,51 @@ public class ServiceDictInfoService extends BaseService{ private ServiceDictInfoDao serviceDictInfoDao; /** - * 查询分类性质字典分页 + * 查询分类性质字典分页(无条件查询) * @param page * @param serviceDictInfo * @return */ - public Page findDictList(Page page, ServiceDictInfo serviceDictInfo) { + public Page findTopDictList(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); + //查出顶层分页查询 + List parentList = serviceDictInfoDao.findTopDictList(serviceDictInfo); + page.setList(parentList); return page; } + /** + * 查询所有有效字典配置 + * @return + */ + public List findAllDictList() { + + return serviceDictInfoDao.findAllDictList(new ServiceDictInfo()); + } /** - * 查询标签分页 + * 查询所有的非叶子配置 + */ + public List findAllNoLeafDictList() { + return serviceDictInfoDao.findAllNoLeafDictList(); + } + /** + * 查询分类性质字典分页(含条件查询) * @param page * @param serviceDictInfo * @return */ - public Page findDictMarkList(Page page, ServiceDictInfo serviceDictInfo) { + public Page findDictSearchList(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; + serviceDictInfo.setPage(page); + List parentList = serviceDictInfoDao.findDictSearchList(serviceDictInfo); + page.setList(parentList); + return page; } + + /** * 根据主键查询字典详细信息 * @param serviceDictId @@ -99,19 +111,82 @@ public class ServiceDictInfoService extends BaseService{ * 查询所有非叶子节点字典配置信息 * @return */ - public List findAllDict() { +/* public List findAllDict() { return serviceDictInfoDao.findAllDict(); - } + }*/ /** * 删除 * @param serviceDictInfo */ public void deleteDict(ServiceDictInfo serviceDictInfo) { - serviceDictInfo.setIsValid(0); - serviceDictInfoDao.delete(serviceDictInfo); + List list = Lists.newArrayList(); + //找出所有下级 + //查出所有节点 + ServiceDictInfo.sortList(list, serviceDictInfoDao.findAllDictList(new ServiceDictInfo()), serviceDictInfo.getServiceDictId(), true); + list.add(serviceDictInfo); + for(ServiceDictInfo se:list){ + se.setIsValid(0); + serviceDictInfoDao.delete(se); + } + } + + + + //标签管理 + + /** + * 查询标签分页(无条件查询) + * @param page + * @param serviceDictInfo + * @return + */ + public Page findTopDictMarkList(Page page, ServiceDictInfo serviceDictInfo) { + // 设置分页参数 + serviceDictInfo.setPage(page); + //查出顶层分页查询 + List parentList = serviceDictInfoDao.findTopDictMarkList(serviceDictInfo); + page.setList(parentList); + return page; + } + /** + * 查询所有有效标签配置 + * @return + */ + public List findAllDictMarkList() { + + return serviceDictInfoDao.findAllDictMarkList(new ServiceDictInfo()); + } + + /** + * 查询标签字典分页(含条件查询) + * @param page + * @param serviceDictInfo + * @return + */ + public Page findDictSearchMarkList(Page page, ServiceDictInfo serviceDictInfo) { + // 设置分页参数 + serviceDictInfo.setPage(page); + List parentList = serviceDictInfoDao.findDictSearchMarkList(serviceDictInfo); + page.setList(parentList); + return page; + } + + + + /** + * 查询所有的非叶子配置 + */ + public List findAllNoLeafDictMarkList() { + return serviceDictInfoDao.findAllNoLeafDictMarkList(); + } + + + + + /** * * findFlDict(查找所有有效的分类) @@ -185,5 +260,10 @@ public class ServiceDictInfoService extends BaseService{ public List findAllLableDict() { return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_LABEL); } + + + + + } diff --git a/src/main/java/com/nis/web/service/configuration/StringCfgService.java b/src/main/java/com/nis/web/service/configuration/StringCfgService.java new file mode 100644 index 000000000..368b1200f --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/StringCfgService.java @@ -0,0 +1,190 @@ +package com.nis.web.service.configuration; + +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.web.dao.configuration.StringCfgDao; +import com.nis.web.service.CrudService; + +/** + * String相关配置事务类 + * @author dell + * + */ +@Service +public class StringCfgService extends CrudService { + @Autowired + protected StringCfgDao stringCfgDao; + /** + * + * addStringCfg(新增IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int addStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.insert(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("save "+tableName); + return stringCfgDao.insert(baseStringCfg); + } + + } + /** + * + * updateStringCfg(更新IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int updateStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("update "+tableName); + return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg); + } + + } + /** + * + * auditStringCfg(审核IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int auditStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.audit(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("aduit "+tableName); + return stringCfgDao.audit(baseStringCfg); + } + + } + /** + * + * deleteStringCfg(删除IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int deleteStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.updateValid(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("delete "+tableName); + return stringCfgDao.updateValid(baseStringCfg); + } + + } + /** + * + * getStringCfg(根据IP与类名获取IP配置) + * (继承BaseStringCfg这个类方可使用) + * @param clazz + * @param id + * @return + *BaseStringCfg + * @exception + * @since 1.0.0 + */ + public BaseStringCfg getStringCfgById(Class clazz,long id){ + String tableName=getTableName(clazz.getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + logger.info("get "+tableName); + return stringCfgDao.getById(tableName, id); + } + /** + * + * getStringCfg(根据IP与类名获取IP配置) + * (继承BaseStringCfg这个类方可使用) + * @param clazz + * @param id + * @return + *BaseStringCfg + * @exception + * @since 1.0.0 + */ + public BaseStringCfg getStringCfgById(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.get(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseStringCfg.setTableName(tableName); + logger.info("get "+tableName); + return stringCfgDao.get(baseStringCfg); + } + + } + public Integer getIsValid(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.getIsValid(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseStringCfg.setTableName(tableName); + return stringCfgDao.getIsValid(baseStringCfg); + } + + } + public Integer getIsValid(String tableName, long id){ + return stringCfgDao.getIsValid(tableName,id); + } + public Integer getIsAudit(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.getIsAudit(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseStringCfg.setTableName(tableName); + return stringCfgDao.getIsAudit(baseStringCfg); + } + + } + public Integer getIsAudit(String tableName, long id){ + return stringCfgDao.getIsAudit(tableName,id); + } +} diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 02b4fb388..03b4fef25 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -11,7 +11,7 @@ + selected>${requestInfo.requestTitle} @@ -26,7 +26,7 @@ @@ -45,7 +45,7 @@ @@ -60,7 +60,7 @@ diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp new file mode 100644 index 000000000..e2dc40770 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -0,0 +1,121 @@ +<%@ 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/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index 12aab3a5d..f2ce0facb 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -6,7 +6,7 @@
- +
@@ -15,10 +15,10 @@
- +
@@ -28,7 +28,7 @@
- +
@@ -36,7 +36,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -54,7 +54,7 @@
- +
@@ -64,7 +64,7 @@
- +
@@ -72,7 +72,7 @@
- +
@@ -82,7 +82,7 @@
- +
@@ -90,7 +90,7 @@
- +
@@ -101,10 +101,10 @@
- <%-- --%> + <%-- --%>
@@ -113,11 +113,11 @@
- <%-- --%> + <%-- --%>
@@ -127,7 +127,7 @@
- +
@@ -135,7 +135,15 @@
- + + <%-- --%>
@@ -145,7 +153,7 @@
- +
@@ -155,12 +163,12 @@
@@ -174,15 +182,15 @@
- <%-- --%> + <%-- --%>
@@ -190,7 +198,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp new file mode 100644 index 000000000..84ff30ca2 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -0,0 +1,112 @@ +<%@ 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/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag index bd46fd1e0..29af115b5 100644 --- a/src/main/webapp/WEB-INF/tags/sys/message.tag +++ b/src/main/webapp/WEB-INF/tags/sys/message.tag @@ -6,5 +6,5 @@
${content}
- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp new file mode 100644 index 000000000..bf7b8f752 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -0,0 +1,102 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ +

+ + 新增 + 修改 +

+ +
+
+
+
+
+ + 新增 + 修改 +
+ +
+
+ +
+
+ <%@include file="/WEB-INF/include/form/complexInfo.jsp" %> + + + + + + + + + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> + + +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp new file mode 100644 index 000000000..e4e118ea2 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -0,0 +1,212 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ + +

+ 详情 +

+ +
+
+
+
+
+ 详情 +
+
+ +
+
+
+
+ + + +
+ : + + + + + + + : + + + + + + + + : + + + 按创建时间顺序 + 按创建时间倒序 + 按修改时间顺序 + 按修改时间倒序 + 按审核时间顺序 + 按审核时间倒序 + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
配置ID配置描述匹配区域关键字管控类型业务id来函编译id是否区域管控分类性质标签区域生效id有效标识是否审核创建人员配置时间修改人员修改时间审核人员审核时间
${cfg.cfgId }${cfg.cfgDesc }${cfg.district }${cfg.keywords } + 阻断 + 监测 + 封堵白名单 + 监测白名单 + 封堵监测白名单 + 灰名单 + ${cfg.serviceId }${cfg.requestName }${cfg.compileId } + 否 + 是 + ${cfg.classifyName }${cfg.attributeName }${cfg.lableName }${cfg.areaEffectiveIds } + 否 + 是 + 已删除 + + + + + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName } +
+ +
    + + + +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +     +     +
+
+
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 3bc3f7195..068611e2e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -8,9 +8,12 @@ + - - -
-
-
-
-
-
- -
-
-
- -
- - - -
- - - - " 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}
-
-
-
-
+
+
+
+ + + + +
+ + + + : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + + +
+ + + + + + + + + + + + + + + + + +
配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作
${serviceDictInfo.itemValue}${serviceDictInfo.itemCode}${fns:abbr(serviceDictInfo.itemDesc,15)}${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}${fns:getDictLabel("SYS_YES_NO",serviceDictInfo.isLeaf,"0")} + ${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name} + + ${fns:getUserById(serviceDictInfo.serviceDictEditor.id).name} + +
+ 操作 + +
+
+ + +
+
+
+ +
+
+
${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 index 923e08db4..360c44617 100644 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkForm.jsp @@ -86,26 +86,31 @@
- +
- <%--
- -
--%> -
- <%-- --%> - +
- - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp index c2fdefd12..eb1ac56e4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp @@ -2,138 +2,135 @@ <%@ 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}
-
-
-
-
+
+
+
+ + + + +
+ + + + : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + + +
+ + + + + + + + + + + + + + + + + +
配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作
${serviceDictInfo.itemValue}${serviceDictInfo.itemCode}${fns:abbr(serviceDictInfo.itemDesc,15)}${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}${fns:getDictLabel("SYS_YES_NO",serviceDictInfo.isLeaf,"0")} + ${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name} + + ${fns:getUserById(serviceDictInfo.serviceDictEditor.id).name} + +
+ 操作 + +
+
+ + +
+
+
+ +
+
+
${page}
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp new file mode 100644 index 000000000..58ba481d8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp @@ -0,0 +1,101 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ +

+ + 新增 + 修改 +

+ +
+
+
+
+
+ + 新增 + 修改 +
+ +
+
+ +
+
+ <%@include file="/WEB-INF/include/form/stringInfo.jsp" %> + + + + + + + + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> + + +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp new file mode 100644 index 000000000..b2d0139d7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -0,0 +1,210 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ + +

+ 详情 +

+ +
+
+
+
+
+ 详情 +
+
+ +
+
+
+
+ + + +
+ : + + + + + + + : + + + + + + + + : + + + 按创建时间顺序 + 按创建时间倒序 + 按修改时间顺序 + 按修改时间倒序 + 按审核时间顺序 + 按审核时间倒序 + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
配置ID配置描述配置关键词管控类型业务id来函编译id是否区域管控分类性质标签区域生效id有效标识是否审核创建人员配置时间修改人员修改时间审核人员审核时间
${cfg.cfgId }${cfg.cfgDesc }${cfg.cfgKeywords } + 阻断 + 监测 + 封堵白名单 + 监测白名单 + 封堵监测白名单 + 灰名单 + ${cfg.serviceId }${cfg.requestName }${cfg.compileId } + 否 + 是 + ${cfg.classifyName }${cfg.attributeName }${cfg.lableName }${cfg.areaEffectiveIds } + 否 + 是 + 已删除 + + + + + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName } +
+ +
    + + + +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +     +     +
+
+
+
${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 index 98551a010..3e9220df3 100644 --- a/src/main/webapp/static/pages/css/dictInfo.css +++ b/src/main/webapp/static/pages/css/dictInfo.css @@ -6,3 +6,16 @@ sysDict serviceDict margin-right: 5px; margin-left: 8px; } + + .input-medium { + width: 155px !important; +} + .Wdate { + border: #c2cad8 1px solid; + height: 26px; +} + +.dropdown-menu { + min-width: 50px; +} + diff --git a/src/main/webapp/static/pages/scripts/dict.js b/src/main/webapp/static/pages/scripts/dict.js new file mode 100644 index 000000000..321cc231d --- /dev/null +++ b/src/main/webapp/static/pages/scripts/dict.js @@ -0,0 +1,34 @@ +$(document).ready(function() { + jQuery.validator.addMethod("codeNumber",function(value,element){ + return value>=0&value<=20000000},"请填写正确的数值"); + $("#name").focus(); + $("#searchForm").validate({ + //需验证 item_code item_value + rules: { + 'itemCode':{ + digits:true, + codeNumber:true + } + }, + messages: { + 'itemCode':{ + digits:'请填写整数值', + codeNumber:'请填写合适的数值（0~200000000）' + } + }, + + submitHandler: function(form){ + loading('正在处理，请稍等...'); + form.submit(); + }, + errorContainer: "#messageBox", + errorPlacement: function(error, element) { + $("#messageBox").text("输入有误，请先更正。"); + if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){ + error.appendTo(element.parent().parent()); + } else { + error.insertAfter(element); + } + } + }); + }); \ No newline at end of file