diff --git a/src/main/java/com/nis/domain/SystemServiceInfo.java b/src/main/java/com/nis/domain/SystemServiceInfo.java index a918795c6..75ef7698f 100644 --- a/src/main/java/com/nis/domain/SystemServiceInfo.java +++ b/src/main/java/com/nis/domain/SystemServiceInfo.java @@ -6,7 +6,7 @@ import java.util.List; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - +@Deprecated public class SystemServiceInfo extends BaseEntity { private static final long serialVersionUID = -8919580011013718190L; diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 916d02428..4d4274aeb 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -11,8 +11,6 @@ package com.nis.domain.configuration; import java.util.Date; import java.util.List; -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.SerializedName; import com.nis.domain.BaseEntity; /** @@ -33,9 +31,6 @@ public class BaseCfg extends BaseEntity implements Cloneable{ * 编译id */ protected Integer compileId ; - @Expose - @SerializedName("maatTable") - protected String maatTable; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -112,10 +107,6 @@ public class BaseCfg extends BaseEntity implements Cloneable{ * 来函 */ protected String requestName; - /** - * 编译id - */ -// protected Integer compileId; /** * 是否区域gk */ @@ -144,9 +135,6 @@ public class BaseCfg extends BaseEntity implements Cloneable{ * 标签 */ protected String lableName; -// protected Integer exprType =0; -// protected Integer matchMethod =0; -// protected Integer isHexbin =0; /** * 区域生效id */ @@ -160,6 +148,22 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected Date search_edit_time_end; protected Date search_audit_time_start; protected Date search_audit_time_end; + protected Integer functionId; + + /** + * functionId + * @return functionId + */ + + public Integer getFunctionId() { + return functionId; + } + /** + * @param functionId the functionId to set + */ + public void setFunctionId(Integer functionId) { + this.functionId = functionId; + } /** * cfgId * @return cfgId @@ -542,20 +546,6 @@ public class BaseCfg extends BaseEntity implements Cloneable{ public void setRequestName(String requestName) { this.requestName = requestName; } - /** - * maatTable - * @return maatTable - */ - - public String getMaatTable() { - return maatTable; - } - /** - * @param maatTable the maatTable to set - */ - public void setMaatTable(String maatTable) { - this.maatTable = maatTable; - } /** * search_create_time_start * @return search_create_time_start diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 6cfe201e0..5f7ec63e8 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -34,6 +34,16 @@ public class BaseStringCfg extends BaseCfg { @SerializedName("keywords") protected String cfgKeywords; protected String cfgKeywordsShowName; + protected String cfgType; + + /** + * cfgType + * @return cfgType + */ + + public String getCfgType() { + return cfgType; + } /** * cfgKeywords * @return cfgKeywords diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index f2568dcbb..d1076ca7c 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringUtils; - import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -60,6 +58,22 @@ public class ComplexkeywordCfg extends BaseCfg{ @Expose @SerializedName("isHexbin") protected Integer isHexbin ; + protected String cfgType; + + /** + * cfgType + * @return cfgType + */ + + public String getCfgType() { + return cfgType; + } + /** + * @param cfgType the cfgType to set + */ + public void setCfgType(String cfgType) { + this.cfgType = cfgType; + } /** * district * @return district diff --git a/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java b/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java deleted file mode 100644 index e59b6a6f7..000000000 --- a/src/main/java/com/nis/domain/configuration/FtpFileContentCfg.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - *@Title: FtpFileContentConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月6日 上午8:27:21 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: FtpFileContentConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月6日 上午8:27:21 - * @version V1.0 - */ -public class FtpFileContentCfg extends BaseStringCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 7996351716704137873L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - super.initDefaultValue(); - this.matchMethod=0; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java b/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java deleted file mode 100644 index 8bb64160e..000000000 --- a/src/main/java/com/nis/domain/configuration/FtpFileNameCfg.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - *@Title: FtpFileNameConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月6日 上午8:24:13 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: FtpFileNameConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月6日 上午8:24:13 - * @version V1.0 - */ -public class FtpFileNameCfg extends BaseStringCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -3947991086808399842L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - super.initDefaultValue(); - this.matchMethod=0; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/FtpIpCfg.java b/src/main/java/com/nis/domain/configuration/FtpIpCfg.java deleted file mode 100644 index e4bf3af21..000000000 --- a/src/main/java/com/nis/domain/configuration/FtpIpCfg.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - *@Title: FtpIpConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月6日 上午8:29:26 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: FtpIpConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月6日 上午8:29:26 - * @version V1.0 - */ -public class FtpIpCfg extends BaseIpCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -7878447087396996553L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - super.initDefaultValue(); - this.protocolId=7; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/FtpAddrCfg.java b/src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java similarity index 85% rename from src/main/java/com/nis/domain/configuration/FtpAddrCfg.java rename to src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java index 8840a9a9a..d1d7b5860 100644 --- a/src/main/java/com/nis/domain/configuration/FtpAddrCfg.java +++ b/src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java @@ -9,13 +9,13 @@ package com.nis.domain.configuration; /** - * @ClassName: FtpAddrConfig.java + * @ClassName: FtpKeywordCfg.java * @Description: TODO * @author (dell) * @date 2018年2月6日 上午8:18:55 * @version V1.0 */ -public class FtpAddrCfg extends BaseStringCfg{ +public class FtpKeywordCfg extends BaseStringCfg{ /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/HttpIpCfg.java b/src/main/java/com/nis/domain/configuration/HttpIpCfg.java deleted file mode 100644 index 7bee74573..000000000 --- a/src/main/java/com/nis/domain/configuration/HttpIpCfg.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - *@Title: HttpIpConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午5:52:35 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: HttpIpConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午5:52:35 - * @version V1.0 - */ -public class HttpIpCfg extends BaseIpCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -4652367183432063965L; - - /* (non-Javadoc) - * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - super.initDefaultValue(); - this.protocolId=4; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java b/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java deleted file mode 100644 index dbf221fe8..000000000 --- a/src/main/java/com/nis/domain/configuration/MailAttachNameCfg.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - *@Title: MailAttachNameConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午6:25:21 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: MailAttachNameConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午6:25:21 - * @version V1.0 - */ -public class MailAttachNameCfg extends ComplexkeywordCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 9067647371707152226L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() - */ - @Override - 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 deleted file mode 100644 index 386206738..000000000 --- a/src/main/java/com/nis/domain/configuration/MailContentCfg.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - *@Title: MailContentConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午6:23:41 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: MailContentConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午6:23:41 - * @version V1.0 - */ -public class MailContentCfg extends ComplexkeywordCfg{ - public static final String tableName="mail_content_cfg"; - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -4257845942210782532L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() - */ - @Override - 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 deleted file mode 100644 index 0d12a3115..000000000 --- a/src/main/java/com/nis/domain/configuration/MailFromCfg.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - *@Title: MailFromConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午5:58:45 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: MailFromConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午5:58:45 - * @version V1.0 - */ -public class MailFromCfg extends ComplexkeywordCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 7605303118334439422L; - - /* (non-Javadoc) - * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() - */ - @Override - 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/MailIpCfg.java b/src/main/java/com/nis/domain/configuration/MailIpCfg.java deleted file mode 100644 index f63b34835..000000000 --- a/src/main/java/com/nis/domain/configuration/MailIpCfg.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - *@Title: MailIpConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午6:42:07 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: MailIpConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午6:42:07 - * @version V1.0 - */ -public class MailIpCfg extends BaseIpCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 2358673955555645618L; - - /* (non-Javadoc) - * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - super.initDefaultValue(); - this.protocolId=5; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java b/src/main/java/com/nis/domain/configuration/MailKeywordCfg.java similarity index 86% rename from src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java rename to src/main/java/com/nis/domain/configuration/MailKeywordCfg.java index 5e8f53b54..769a3454d 100644 --- a/src/main/java/com/nis/domain/configuration/MailAttachContentCfg.java +++ b/src/main/java/com/nis/domain/configuration/MailKeywordCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月5日 下午6:40:26 * @version V1.0 */ -public class MailAttachContentCfg extends ComplexkeywordCfg { +public class MailKeywordCfg extends ComplexkeywordCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -30,7 +30,6 @@ public class MailAttachContentCfg extends ComplexkeywordCfg { 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/MailSubjectCfg.java b/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java deleted file mode 100644 index 19580cd92..000000000 --- a/src/main/java/com/nis/domain/configuration/MailSubjectCfg.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - *@Title: MailSubjectConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午6:22:21 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: MailSubjectConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午6:22:21 - * @version V1.0 - */ -public class MailSubjectCfg extends ComplexkeywordCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -547690498444330212L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() - */ - @Override - 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 deleted file mode 100644 index 2b27f6f0e..000000000 --- a/src/main/java/com/nis/domain/configuration/MailToCfg.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - *@Title: MailToConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午6:00:11 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: MailToConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月5日 下午6:00:11 - * @version V1.0 - */ -public class MailToCfg extends ComplexkeywordCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -7755270610917876826L; - - /* (non-Javadoc) - * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() - */ - @Override - 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/SslIpCfg.java b/src/main/java/com/nis/domain/configuration/SslIpCfg.java deleted file mode 100644 index cc8f2c833..000000000 --- a/src/main/java/com/nis/domain/configuration/SslIpCfg.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - *@Title: SslIpConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月6日 上午9:10:46 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: SslIpConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月6日 上午9:10:46 - * @version V1.0 - */ -public class SslIpCfg extends BaseIpCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -1334085146634344608L; - - /* (non-Javadoc) - * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - super.initDefaultValue(); - this.protocolId=9; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/SslCertCfg.java b/src/main/java/com/nis/domain/configuration/SslKeywordCfg.java similarity index 88% rename from src/main/java/com/nis/domain/configuration/SslCertCfg.java rename to src/main/java/com/nis/domain/configuration/SslKeywordCfg.java index 1c79c03f5..5e37aa846 100644 --- a/src/main/java/com/nis/domain/configuration/SslCertCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslKeywordCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:59:51 * @version V1.0 */ -public class SslCertCfg extends ComplexkeywordCfg{ +public class SslKeywordCfg extends ComplexkeywordCfg{ public static final String tableName="ssl_cert_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） @@ -32,7 +32,6 @@ public class SslCertCfg extends ComplexkeywordCfg{ public void initDefaultValue() { // TODO Auto-generated method stub 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 deleted file mode 100644 index 2c889e2cd..000000000 --- a/src/main/java/com/nis/domain/configuration/SslSniCfg.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - *@Title: SslSniConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月6日 上午9:02:44 - *@version 版本号 - */ -package com.nis.domain.configuration; - -/** - * @ClassName: SslSniConfig.java - * @Description: TODO - * @author (dell) - * @date 2018年2月6日 上午9:02:44 - * @version V1.0 - */ -public class SslSniCfg extends ComplexkeywordCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -6648964841408445457L; - /* (non-Javadoc) - * @see com.nis.domain.configuration.ComplexkeywordCfg#initDefaultValue() - */ - @Override - public void initDefaultValue() { - // TODO Auto-generated method stub - 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 847f8e84a..99e6ef6ab 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -59,7 +59,6 @@ import com.nis.web.service.configuration.WebCfgService; import com.nis.web.service.specific.SpecificServiceCfgService; import com.nis.web.service.specific.SpecificServiceHostCfgService; import com.nis.web.service.systemService.ServiceConfigInfoService; -import com.nis.web.service.systemService.SystemServiceService; public class BaseController { @@ -117,8 +116,6 @@ public class BaseController { @Autowired protected AppCfgService appCfgService; - @Autowired - protected SystemServiceService systemServiceService; @Autowired protected ServiceDictInfoService serviceDictInfoService; diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index de83a8f33..c393602e5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -209,10 +209,8 @@ public class ComplexStringCfgController extends BaseController{ for(ComplexkeywordCfg bean:beans){ ComplexkeywordCfg auditBean=new ComplexkeywordCfg(); auditBean.setTableName(tableName); - auditBean.setMaatTable(maatTable); auditBean.setCfgId(bean.getCfgId()); bean.setTableName(tableName); - bean.setMaatTable(maatTable); int audit=bean.getIsAudit().intValue(); if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){ logger.error("审核通过的配置只能取消审核通过！"); @@ -234,7 +232,6 @@ public class ComplexStringCfgController extends BaseController{ } List areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId()); for(AreaIpCfg c:areaCfg){ - c.setMaatTable(AreaIpCfg.getMaattable()); c.setTableName(AreaIpCfg.getTablename()); c.setAuditorId(c.getCurrentUser().getId()); c.setAuditTime(date); 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 44f15d752..4f0e63a8a 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -246,10 +246,8 @@ public class IpCfgController extends BaseController{ for(BaseIpCfg bean:beans){ BaseIpCfg auditBean=new BaseIpCfg(); auditBean.setTableName(tableName); - auditBean.setMaatTable(maatTable); auditBean.setCfgId(bean.getCfgId()); bean.setTableName(tableName); - bean.setMaatTable(maatTable); int audit=bean.getIsAudit().intValue(); if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){ logger.error("审核通过的配置只能取消审核通过！"); @@ -271,7 +269,6 @@ public class IpCfgController extends BaseController{ } List areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId()); for(AreaIpCfg c:areaCfg){ - c.setMaatTable(AreaIpCfg.getMaattable()); c.setTableName(AreaIpCfg.getTablename()); c.setAuditorId(c.getCurrentUser().getId()); c.setAuditTime(date); diff --git a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java index bc8754600..13e00036e 100644 --- a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java @@ -953,7 +953,6 @@ public class MultipleCfgController extends BaseController{ //根据表名，编译ID查询唯一结果 BaseIpCfg _resultCfg=ipCfgService.get(searchCfg); if(_resultCfg!=null){ - _resultCfg.setMaatTable(info.getMaatTable()); searchCfg.setAuditorId(searchCfg.getCurrentUser().getId()); searchCfg.setAuditTime(date); searchCfg.setCfgId(_resultCfg.getCfgId()); @@ -986,7 +985,6 @@ public class MultipleCfgController extends BaseController{ //根据表名，编译ID查询唯一结果 BaseStringCfg _resultCfg=stringCfgService.get(searchCfg); if(_resultCfg!=null){ - _resultCfg.setMaatTable(info.getMaatTable()); searchCfg.setAuditorId(searchCfg.getCurrentUser().getId()); searchCfg.setAuditTime(date); searchCfg.setCfgId(_resultCfg.getCfgId()); @@ -1019,7 +1017,6 @@ public class MultipleCfgController extends BaseController{ //根据表名，编译ID查询唯一结果 NumBoundaryCfg _resultCfg=numCfgService.get(searchCfg); if(_resultCfg!=null){ - _resultCfg.setMaatTable(info.getMaatTable()); searchCfg.setAuditorId(searchCfg.getCurrentUser().getId()); searchCfg.setAuditTime(date); searchCfg.setCfgId(_resultCfg.getCfgId()); @@ -1052,7 +1049,6 @@ public class MultipleCfgController extends BaseController{ //根据表名，编译ID查询唯一结果 ComplexkeywordCfg _resultCfg=complexStringCfgService.get(searchCfg); if(_resultCfg!=null){ - _resultCfg.setMaatTable(info.getMaatTable()); searchCfg.setAuditorId(searchCfg.getCurrentUser().getId()); searchCfg.setAuditTime(date); searchCfg.setCfgId(_resultCfg.getCfgId()); @@ -1084,7 +1080,6 @@ public class MultipleCfgController extends BaseController{ List areaCfgs=ipCfgService.getAreaCfgByCompileId(compileId); for(AreaIpCfg areaCfg:areaCfgs){ areaCfg.setTableName(AreaIpCfg.getTablename()); - areaCfg.setMaatTable(AreaIpCfg.getMaattable()); areaCfg.setAuditorId(areaCfg.getCurrentUser().getId()); areaCfg.setAuditTime(date); areaCfg.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 0123dd3a2..eb6db4974 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -156,11 +156,9 @@ public class NumCfgController extends BaseController{ if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 cfg.setIsValid(Constants.VALID_NO); bean.setIsValid(Constants.VALID_NO); - bean.setMaatTable(serviceConfigInfo.getMaatTable()); }else if(cfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 cfg.setIsValid(Constants.VALID_YES); bean.setIsValid(Constants.VALID_YES); - bean.setMaatTable(serviceConfigInfo.getMaatTable()); } int result=numCfgService.auditNumCfg(bean,cfg); if(result!=0){ diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index 18156408c..c8ddd1583 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -227,10 +227,8 @@ public class StringCfgController extends BaseController{ for(BaseStringCfg bean:beans){ BaseStringCfg auditBean=new BaseStringCfg(); auditBean.setTableName(tableName); - auditBean.setMaatTable(maatTable); auditBean.setCfgId(bean.getCfgId()); bean.setTableName(tableName); - bean.setMaatTable(maatTable); int audit=bean.getIsAudit().intValue(); if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){ logger.error("审核通过的配置只能取消审核通过！"); @@ -252,7 +250,6 @@ public class StringCfgController extends BaseController{ } List areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId()); for(AreaIpCfg c:areaCfg){ - c.setMaatTable(AreaIpCfg.getMaattable()); c.setTableName(AreaIpCfg.getTablename()); c.setAuditorId(c.getCurrentUser().getId()); c.setAuditTime(date); diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java deleted file mode 100644 index bb4eb1336..000000000 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.nis.web.controller.systemService; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import com.nis.domain.Page; -import com.nis.domain.ServiceConfigInfo; -import com.nis.domain.SystemServiceInfo; -import com.nis.util.Collections3; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseController; -import com.nis.web.security.UserUtils; - -@Controller -@RequestMapping("${adminPath}/systemService") -public class SystemServiceController extends BaseController { - - @ModelAttribute - public SystemServiceInfo get(Long id) { - if (!StringUtil.isEmpty(id)){ - return systemServiceService.get(id); - }else{ - return new SystemServiceInfo(); - } - } - - @RequiresPermissions("system:service:view") - @RequestMapping(value = "list") - public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { - systemServiceInfo.setIsValid(1); - Page page = systemServiceService.findPage(new Page(request, response, 30), systemServiceInfo); - model.addAttribute("page", page); - return "/systemService/list"; - } - - @RequiresPermissions("system:service:edit") - @RequestMapping(value = "systemServiceform") - public String detail(Model model, SystemServiceInfo systemServiceInfo) { - return "/systemService/form"; - } - - /** - * 保存(新增、修改) - */ - @RequiresPermissions("system:service:edit") - @RequestMapping(value = "save") - public String save(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, RedirectAttributes redirectAttributes) { - Date now = new Date(); - - //新增 - if (systemServiceInfo.getId() == null) { - systemServiceInfo.setCreateTime(now); - systemServiceInfo.setCreator(UserUtils.getUser()); - systemServiceInfo.setIsValid(1); - systemServiceInfo.setIsInitianlize(0); - } - //更新 - else { - //初始数据不允许非admin修改 - if (!UserUtils.getUser().getLoginId().equals("admin") && systemServiceInfo.getIsInitianlize().intValue() == 1) { - return "/error/403"; - } - systemServiceInfo.setEditTime(now); - systemServiceInfo.setEditor(UserUtils.getUser()); - } - - //接收serviceConfigInfo - String[] reqSciIds = request.getParameterValues("sciId"); - String[] sciIsValids = request.getParameterValues("sciIsValid"); - String[] reqTableNames = request.getParameterValues("tableName"); - String[] reqTableTypes = request.getParameterValues("tableType"); - String[] reqTableDescs = request.getParameterValues("tableDesc"); - String[] reqMaatTables = request.getParameterValues("maatTable"); - - //新增的serviceConfigInfo - List insertServiceConfigInfoList = new ArrayList(); - //更新的serviceConfigInfo - List updateServiceConfigInfoList = new ArrayList(); - - if (reqSciIds != null && reqSciIds.length > 0) { - for (int i = 0; i < reqSciIds.length; i++) { - ServiceConfigInfo sci = new ServiceConfigInfo(); - sci.setId(Long.valueOf(reqSciIds[i])); - sci.setTableName(reqTableNames[i]); - sci.setIsValid(Integer.valueOf(sciIsValids[i])); - sci.setTableType(Integer.valueOf(reqTableTypes[i])); - sci.setTableDesc(reqTableDescs[i]); - sci.setMaatTable(reqMaatTables[i]); - sci.setServiceId(systemServiceInfo.getServiceId()); - - if (sci.getId() == 0) { - sci.setIsInitianlize(0); - insertServiceConfigInfoList.add(sci); - } else { - updateServiceConfigInfoList.add(sci); - } - } - - } - - try { - systemServiceService.save(systemServiceInfo, insertServiceConfigInfoList, updateServiceConfigInfoList); - addMessage(redirectAttributes, "save_success"); - } catch (Exception e) { - addMessage(redirectAttributes, "save_failed"); - e.printStackTrace(); - } - - return "redirect:" + adminPath + "/systemService/list"; - } - - @RequiresPermissions("system:service:edit") - @RequestMapping(value = "delete") - public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { - //增加后台校验，当数据是初始数据时不允许删除 - if(systemServiceInfo.getIsInitianlize().intValue() == 1) { - return "/error/403"; - } - - systemServiceService.deleteService(systemServiceInfo); - try { - systemServiceInfo.setIsValid(1); - Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); - model.addAttribute("page", page); - addMessage(model, "delete_success"); - } catch (Exception e) { - addMessage(model, "delete_failed"); - e.printStackTrace(); - } - return "/systemService/list"; - } - - /** - * serviceId校验 - */ - @ResponseBody - @RequestMapping(value = "serviceIdValidate") - public String serviceIdValidate(String serviceId, Long id) { - List list = systemServiceService.getSystemServiceByServiceId(serviceId); - if (Collections3.isEmpty(list)) { - return "true"; - } else { - if (id != null) { - for (SystemServiceInfo info : list) { - if (info.getId().longValue() == id.longValue()) { - return "true"; - } - } - return "false"; - } else { - return "false"; - } - } - } - - /** - * 通过serviceId前缀获取可用的serviceId - */ - @ResponseBody - @RequestMapping(value = "newServiceId") - public Integer getNewServiceId(Integer serviceIdPre) { - if (serviceIdPre != null) { - SystemServiceInfo ssi = new SystemServiceInfo(); - ssi.setServiceIdPre(serviceIdPre); - ssi.setIsValid(null); - //查找并排序，取得最小的可用serviceId - List list = systemServiceService.findList(ssi); - if (!Collections3.isEmpty(list)) { - Collections.sort(list, new Comparator() { - @Override - public int compare(SystemServiceInfo arg0, SystemServiceInfo arg1) { - return arg1.getServiceId().compareTo(arg0.getServiceId()); - } - }); - return list.get(0).getServiceId() + 1; - } else { - return serviceIdPre * 100; - } - } - return 0; - } -} diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index 0c4032723..530dbfc61 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -6,6 +6,7 @@ + @@ -26,6 +27,7 @@ + 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 ae985a63f..2bb8c0314 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -33,6 +33,7 @@ + @@ -62,6 +63,7 @@ + @@ -70,19 +72,6 @@ - - - - - - - - - - - - - CFG_ID, CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 51786b3a5..9dfb1af2b 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -5,6 +5,7 @@ + @@ -25,11 +26,13 @@ + + @@ -47,6 +50,7 @@ + diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java deleted file mode 100644 index 8fd26b09c..000000000 --- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nis.web.dao.systemService; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -import com.nis.domain.SystemServiceInfo; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; - -@MyBatisDao -public interface SystemServiceInfoDao extends CrudDao { - - List getSystemServiceByServiceId(String serviceId); -} diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml deleted file mode 100644 index d8fb82ecc..000000000 --- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into system_service_info ( - service_id, service_name, service_desc, action, is_valid, service_type, - creator_id, create_time, is_initianlize - ) values( - #{serviceId}, #{serviceName}, #{serviceDesc}, #{action}, #{isValid}, #{serviceType}, - #{creator.id}, #{createTime}, #{isInitianlize} - ) - - - - update - system_service_info - set - service_id=#{serviceId}, - service_name=#{serviceName}, - service_desc=#{serviceDesc}, - action=#{action}, - service_type=#{serviceType}, - editor_id=#{editor.id}, - edit_time=#{editTime} - where id=#{id} - - - - update - system_service_info - set - is_valid=0 - where id=#{id} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/CrudService.java b/src/main/java/com/nis/web/service/CrudService.java index f5a7ccd97..8f8929b71 100644 --- a/src/main/java/com/nis/web/service/CrudService.java +++ b/src/main/java/com/nis/web/service/CrudService.java @@ -337,23 +337,22 @@ public abstract class CrudService, T extends BaseEntity> if(c.getCompileId()==null||c.getCompileId()==0){ throw new RuntimeException("转换出错,未获取到正确的compileId"); } - if(StringUtils.isBlank(c.getMaatTable())){ - throw new RuntimeException("转换出错,未获取到正确的maatTalbe"); - } +// if(StringUtils.isBlank(c.getMaatTable())){ +// throw new RuntimeException("转换出错,未获取到正确的maatTalbe"); +// } //针对含有多个maatTable的表 - if(c.getMaatTable().contains(",")){ - for(String maatTable:c.getMaatTable().split(",")){ - UnAuditBean bean=new UnAuditBean(); - bean.setCompileId(c.getCompileId()); - bean.setMaatTable(maatTable); - toMaatUnAuditBean.getServiceCfg().add(bean); - } - }else{ - UnAuditBean bean=new UnAuditBean(); - bean.setCompileId(c.getCompileId()); - bean.setMaatTable(c.getMaatTable()); - toMaatUnAuditBean.getServiceCfg().add(bean); - } +// if(c.getMaatTable().contains(",")){ +// for(String maatTable:c.getMaatTable().split(",")){ +// UnAuditBean bean=new UnAuditBean(); +// bean.setCompileId(c.getCompileId()); +// bean.setMaatTable(maatTable); +// toMaatUnAuditBean.getServiceCfg().add(bean); +// } +// }else{ +// UnAuditBean bean=new UnAuditBean(); +// bean.setCompileId(c.getCompileId()); +// toMaatUnAuditBean.getServiceCfg().add(bean); +// } } beans.add(toMaatUnAuditBean); @@ -373,102 +372,102 @@ public abstract class CrudService, T extends BaseEntity> if(c instanceof BaseIpCfg){ compileId=compileId==0?c.getCompileId():compileId; int protocolId= ((BaseIpCfg) c).getProtocolId().intValue(); - String maatTable=c.getMaatTable(); - if(maatTable.contains(",")){ - if(protocolId!=0){ - for(String _maatTable:maatTable.split(",")){ - if(_maatTable.toLowerCase().indexOf("ip")>-1){ - BaseIpCfg ipCfg=(BaseIpCfg)c.clone(); - ipCfg.setMaatTable(_maatTable); - if(maatCfg.getIpCfg()==null){ - List list=new ArrayList<>(); - list.add(ipCfg); - maatCfg.setIpCfg(list); - }else{ - List list=maatCfg.getIpCfg(); - list.add(ipCfg); - } - }else{ - NumBoundaryCfg numCfg=new NumBoundaryCfg(); - numCfg.initDefaultValue(); - numCfg.setLowBounadry((long)protocolId); - numCfg.setUpBoundary((long)protocolId); - numCfg.setMaatTable(_maatTable); - if(maatCfg.getNumCfg()==null){ - List numlist=new ArrayList<>(); - numlist.add(numCfg); - maatCfg.setNumCfg(numlist); - }else{ - List numlist=maatCfg.getNumCfg(); - numlist.add(numCfg); - } - } - } - }else{ - throw new RuntimeException("protocolId等于0,却对应两个maat_table "+maatTable); - } - }else{ - if(maatCfg.getIpCfg()==null){ - List list=new ArrayList<>(); - list.add((BaseIpCfg)c); - maatCfg.setIpCfg(list); - }else{ - List list=maatCfg.getIpCfg(); - list.add((BaseIpCfg)c); - } - } +// String maatTable=c.getMaatTable(); +// if(maatTable.contains(",")){ +// if(protocolId!=0){ +// for(String _maatTable:maatTable.split(",")){ +// if(_maatTable.toLowerCase().indexOf("ip")>-1){ +// BaseIpCfg ipCfg=(BaseIpCfg)c.clone(); +// ipCfg.setMaatTable(_maatTable); +// if(maatCfg.getIpCfg()==null){ +// List list=new ArrayList<>(); +// list.add(ipCfg); +// maatCfg.setIpCfg(list); +// }else{ +// List list=maatCfg.getIpCfg(); +// list.add(ipCfg); +// } +// }else{ +// NumBoundaryCfg numCfg=new NumBoundaryCfg(); +// numCfg.initDefaultValue(); +// numCfg.setLowBounadry((long)protocolId); +// numCfg.setUpBoundary((long)protocolId); +// numCfg.setMaatTable(_maatTable); +// if(maatCfg.getNumCfg()==null){ +// List numlist=new ArrayList<>(); +// numlist.add(numCfg); +// maatCfg.setNumCfg(numlist); +// }else{ +// List numlist=maatCfg.getNumCfg(); +// numlist.add(numCfg); +// } +// } +// } +// }else{ +// throw new RuntimeException("protocolId等于0,却对应两个maat_table "+maatTable); +// } +// }else{ +// if(maatCfg.getIpCfg()==null){ +// List list=new ArrayList<>(); +// list.add((BaseIpCfg)c); +// maatCfg.setIpCfg(list); +// }else{ +// List list=maatCfg.getIpCfg(); +// list.add((BaseIpCfg)c); +// } +// } }else if(c instanceof BaseStringCfg){ compileId=compileId==0?c.getCompileId():compileId; - String maatTable=c.getMaatTable(); - if(maatTable.contains(",")){ - for(String _maatTable:maatTable.split(",")){ - BaseStringCfg strCfg=(BaseStringCfg)c.clone(); - strCfg.setMaatTable(_maatTable); - if(maatCfg.getStrCfg()==null){ - List list=new ArrayList(); - list.add(strCfg); - maatCfg.setStrCfg(list); - }else{ - List list=maatCfg.getStrCfg(); - list.add(strCfg); - } - } - }else{ - if(maatCfg.getStrCfg()==null){ - List list=new ArrayList(); - list.add((BaseStringCfg)c); - maatCfg.setStrCfg(list); - }else{ - List list=maatCfg.getStrCfg(); - list.add((BaseStringCfg)c); - } - } +// String maatTable=c.getMaatTable(); +// if(maatTable.contains(",")){ +// for(String _maatTable:maatTable.split(",")){ +// BaseStringCfg strCfg=(BaseStringCfg)c.clone(); +// strCfg.setMaatTable(_maatTable); +// if(maatCfg.getStrCfg()==null){ +// List list=new ArrayList(); +// list.add(strCfg); +// maatCfg.setStrCfg(list); +// }else{ +// List list=maatCfg.getStrCfg(); +// list.add(strCfg); +// } +// } +// }else{ +// if(maatCfg.getStrCfg()==null){ +// List list=new ArrayList(); +// list.add((BaseStringCfg)c); +// maatCfg.setStrCfg(list); +// }else{ +// List list=maatCfg.getStrCfg(); +// list.add((BaseStringCfg)c); +// } +// } }else if(c instanceof ComplexkeywordCfg){ compileId=compileId==0?c.getCompileId():compileId; - String maatTable=c.getMaatTable(); - if(maatTable.contains(",")){ - for(String _maatTable:maatTable.split(",")){ - ComplexkeywordCfg complexCfg=(ComplexkeywordCfg)c.clone(); - complexCfg.setMaatTable(_maatTable); - if(maatCfg.getComplexStrCfg()==null){ - List list=new ArrayList(); - list.add(complexCfg); - maatCfg.setComplexStrCfg(list); - }else{ - List list=maatCfg.getComplexStrCfg(); - list.add(complexCfg); - } - } - }else{ - if(maatCfg.getComplexStrCfg()==null){ - List list=new ArrayList(); - list.add((ComplexkeywordCfg)c); - maatCfg.setComplexStrCfg(list); - }else{ - List list=maatCfg.getComplexStrCfg(); - list.add((ComplexkeywordCfg)c); - } - } +// String maatTable=c.getMaatTable(); +// if(maatTable.contains(",")){ +// for(String _maatTable:maatTable.split(",")){ +// ComplexkeywordCfg complexCfg=(ComplexkeywordCfg)c.clone(); +// complexCfg.setMaatTable(_maatTable); +// if(maatCfg.getComplexStrCfg()==null){ +// List list=new ArrayList(); +// list.add(complexCfg); +// maatCfg.setComplexStrCfg(list); +// }else{ +// List list=maatCfg.getComplexStrCfg(); +// list.add(complexCfg); +// } +// } +// }else{ +// if(maatCfg.getComplexStrCfg()==null){ +// List list=new ArrayList(); +// list.add((ComplexkeywordCfg)c); +// maatCfg.setComplexStrCfg(list); +// }else{ +// List list=maatCfg.getComplexStrCfg(); +// list.add((ComplexkeywordCfg)c); +// } +// } }else if(c instanceof NumBoundaryCfg){ compileId=compileId==0?c.getCompileId():compileId; @@ -562,23 +561,23 @@ public abstract class CrudService, T extends BaseEntity> if(c.getCompileId()==null||c.getCompileId()==0){ throw new RuntimeException("转换出错,未获取到正确的compileId"); } - if(StringUtils.isBlank(c.getMaatTable())){ - throw new RuntimeException("转换出错,未获取到正确的maatTalbe"); - } +// if(StringUtils.isBlank(c.getMaatTable())){ +// throw new RuntimeException("转换出错,未获取到正确的maatTalbe"); +// } //针对含有多个maatTable的表 - if(c.getMaatTable().contains(",")){ - for(String maatTable:c.getMaatTable().split(",")){ - UnAuditBean bean=new UnAuditBean(); - bean.setCompileId(c.getCompileId()); - bean.setMaatTable(maatTable); - toMaatUnAuditBean.getServiceCfg().add(bean); - } - }else{ - UnAuditBean bean=new UnAuditBean(); - bean.setCompileId(c.getCompileId()); - bean.setMaatTable(c.getMaatTable()); - toMaatUnAuditBean.getServiceCfg().add(bean); - } +// if(c.getMaatTable().contains(",")){ +// for(String maatTable:c.getMaatTable().split(",")){ +// UnAuditBean bean=new UnAuditBean(); +// bean.setCompileId(c.getCompileId()); +// bean.setMaatTable(maatTable); +// toMaatUnAuditBean.getServiceCfg().add(bean); +// } +// }else{ +// UnAuditBean bean=new UnAuditBean(); +// bean.setCompileId(c.getCompileId()); +// bean.setMaatTable(c.getMaatTable()); +// toMaatUnAuditBean.getServiceCfg().add(bean); +// } } String json=gson.toJson(toMaatUnAuditBean); @@ -594,102 +593,102 @@ public abstract class CrudService, T extends BaseEntity> if(c instanceof BaseIpCfg){ compileId=compileId==0?c.getCompileId():compileId; int protocolId= ((BaseIpCfg) c).getProtocolId().intValue(); - String maatTable=c.getMaatTable(); - if(maatTable.contains(",")){ - if(protocolId!=0){ - for(String _maatTable:maatTable.split(",")){ - if(_maatTable.toLowerCase().indexOf("ip")>-1){ - BaseIpCfg ipCfg=(BaseIpCfg)c.clone(); - ipCfg.setMaatTable(_maatTable); - if(maatCfg.getIpCfg()==null){ - List list=new ArrayList<>(); - list.add(ipCfg); - maatCfg.setIpCfg(list); - }else{ - List list=maatCfg.getIpCfg(); - list.add(ipCfg); - } - }else{ - NumBoundaryCfg numCfg=new NumBoundaryCfg(); - numCfg.initDefaultValue(); - numCfg.setLowBounadry((long)protocolId); - numCfg.setUpBoundary((long)protocolId); - numCfg.setMaatTable(_maatTable); - if(maatCfg.getNumCfg()==null){ - List numlist=new ArrayList<>(); - numlist.add(numCfg); - maatCfg.setNumCfg(numlist); - }else{ - List numlist=maatCfg.getNumCfg(); - numlist.add(numCfg); - } - } - } - }else{ - throw new RuntimeException("protocolId等于0,却对应两个maat_table "+maatTable); - } - }else{ - if(maatCfg.getIpCfg()==null){ - List list=new ArrayList<>(); - list.add((BaseIpCfg)c); - maatCfg.setIpCfg(list); - }else{ - List list=maatCfg.getIpCfg(); - list.add((BaseIpCfg)c); - } - } +// String maatTable=c.getMaatTable(); +// if(maatTable.contains(",")){ +// if(protocolId!=0){ +// for(String _maatTable:maatTable.split(",")){ +// if(_maatTable.toLowerCase().indexOf("ip")>-1){ +// BaseIpCfg ipCfg=(BaseIpCfg)c.clone(); +// ipCfg.setMaatTable(_maatTable); +// if(maatCfg.getIpCfg()==null){ +// List list=new ArrayList<>(); +// list.add(ipCfg); +// maatCfg.setIpCfg(list); +// }else{ +// List list=maatCfg.getIpCfg(); +// list.add(ipCfg); +// } +// }else{ +// NumBoundaryCfg numCfg=new NumBoundaryCfg(); +// numCfg.initDefaultValue(); +// numCfg.setLowBounadry((long)protocolId); +// numCfg.setUpBoundary((long)protocolId); +// numCfg.setMaatTable(_maatTable); +// if(maatCfg.getNumCfg()==null){ +// List numlist=new ArrayList<>(); +// numlist.add(numCfg); +// maatCfg.setNumCfg(numlist); +// }else{ +// List numlist=maatCfg.getNumCfg(); +// numlist.add(numCfg); +// } +// } +// } +// }else{ +// throw new RuntimeException("protocolId等于0,却对应两个maat_table "+maatTable); +// } +// }else{ +// if(maatCfg.getIpCfg()==null){ +// List list=new ArrayList<>(); +// list.add((BaseIpCfg)c); +// maatCfg.setIpCfg(list); +// }else{ +// List list=maatCfg.getIpCfg(); +// list.add((BaseIpCfg)c); +// } +// } }else if(c instanceof BaseStringCfg){ compileId=compileId==0?c.getCompileId():compileId; - String maatTable=c.getMaatTable(); - if(maatTable.contains(",")){ - for(String _maatTable:maatTable.split(",")){ - BaseStringCfg strCfg=(BaseStringCfg)c.clone(); - strCfg.setMaatTable(_maatTable); - if(maatCfg.getStrCfg()==null){ - List list=new ArrayList(); - list.add(strCfg); - maatCfg.setStrCfg(list); - }else{ - List list=maatCfg.getStrCfg(); - list.add(strCfg); - } - } - }else{ - if(maatCfg.getStrCfg()==null){ - List list=new ArrayList(); - list.add((BaseStringCfg)c); - maatCfg.setStrCfg(list); - }else{ - List list=maatCfg.getStrCfg(); - list.add((BaseStringCfg)c); - } - } +// String maatTable=c.getMaatTable(); +// if(maatTable.contains(",")){ +// for(String _maatTable:maatTable.split(",")){ +// BaseStringCfg strCfg=(BaseStringCfg)c.clone(); +// strCfg.setMaatTable(_maatTable); +// if(maatCfg.getStrCfg()==null){ +// List list=new ArrayList(); +// list.add(strCfg); +// maatCfg.setStrCfg(list); +// }else{ +// List list=maatCfg.getStrCfg(); +// list.add(strCfg); +// } +// } +// }else{ +// if(maatCfg.getStrCfg()==null){ +// List list=new ArrayList(); +// list.add((BaseStringCfg)c); +// maatCfg.setStrCfg(list); +// }else{ +// List list=maatCfg.getStrCfg(); +// list.add((BaseStringCfg)c); +// } +// } }else if(c instanceof ComplexkeywordCfg){ compileId=compileId==0?c.getCompileId():compileId; - String maatTable=c.getMaatTable(); - if(maatTable.contains(",")){ - for(String _maatTable:maatTable.split(",")){ - ComplexkeywordCfg complexCfg=(ComplexkeywordCfg)c.clone(); - complexCfg.setMaatTable(_maatTable); - if(maatCfg.getComplexStrCfg()==null){ - List list=new ArrayList(); - list.add(complexCfg); - maatCfg.setComplexStrCfg(list); - }else{ - List list=maatCfg.getComplexStrCfg(); - list.add(complexCfg); - } - } - }else{ - if(maatCfg.getComplexStrCfg()==null){ - List list=new ArrayList(); - list.add((ComplexkeywordCfg)c); - maatCfg.setComplexStrCfg(list); - }else{ - List list=maatCfg.getComplexStrCfg(); - list.add((ComplexkeywordCfg)c); - } - } +// String maatTable=c.getMaatTable(); +// if(maatTable.contains(",")){ +// for(String _maatTable:maatTable.split(",")){ +// ComplexkeywordCfg complexCfg=(ComplexkeywordCfg)c.clone(); +// complexCfg.setMaatTable(_maatTable); +// if(maatCfg.getComplexStrCfg()==null){ +// List list=new ArrayList(); +// list.add(complexCfg); +// maatCfg.setComplexStrCfg(list); +// }else{ +// List list=maatCfg.getComplexStrCfg(); +// list.add(complexCfg); +// } +// } +// }else{ +// if(maatCfg.getComplexStrCfg()==null){ +// List list=new ArrayList(); +// list.add((ComplexkeywordCfg)c); +// maatCfg.setComplexStrCfg(list); +// }else{ +// List list=maatCfg.getComplexStrCfg(); +// list.add((ComplexkeywordCfg)c); +// } +// } }else if(c instanceof NumBoundaryCfg){ compileId=compileId==0?c.getCompileId():compileId; diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 3443672cf..cecfee383 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -349,7 +349,6 @@ public class AppCfgService extends CrudService { if(!StringUtil.isEmpty(cList)){ for(ServiceConfigInfo c:cList){ if(c.getTableName().equals(featuresCfg.getFeaturesTable())){ - cfg.setMaatTable(c.getMaatTable()); } } @@ -365,7 +364,6 @@ public class AppCfgService extends CrudService { if(!StringUtil.isEmpty(cList)){ for(ServiceConfigInfo c:cList){ if(c.getTableName().equals(featuresCfg.getFeaturesTable())){ - cfg.setMaatTable(c.getMaatTable()); } } } @@ -453,7 +451,6 @@ public class AppCfgService extends CrudService { if(!StringUtil.isEmpty(cList)){ for(ServiceConfigInfo c:cList){ if(c.getTableName().equals(featuresCfg.getFeaturesTable())){ - strCfg.setMaatTable(c.getMaatTable()); } } @@ -470,7 +467,6 @@ public class AppCfgService extends CrudService { if(!StringUtil.isEmpty(cList)){ for(ServiceConfigInfo c:cList){ if(c.getTableName().equals(featuresCfg.getFeaturesTable())){ - complexCfg.setMaatTable(c.getMaatTable()); } } } diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index 323e88a42..52916dfd3 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import com.nis.web.dao.FunctionRegionDictDao; import com.nis.web.dao.FunctionServiceDictDao; import com.nis.web.dao.configuration.AvCfgDao; -import com.nis.web.service.CrudService; +import com.nis.web.service.BaseService; /** @@ -16,7 +16,7 @@ import com.nis.web.service.CrudService; * */ @Service -public class AvCfgService extends CrudService { +public class AvCfgService extends BaseService { @Autowired protected FunctionRegionDictDao functionRegionDictDao; @Autowired diff --git a/src/main/java/com/nis/web/service/systemService/SystemServiceService.java b/src/main/java/com/nis/web/service/systemService/SystemServiceService.java deleted file mode 100644 index 50991dd0c..000000000 --- a/src/main/java/com/nis/web/service/systemService/SystemServiceService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.nis.web.service.systemService; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.ServiceConfigInfo; -import com.nis.domain.SystemServiceInfo; -import com.nis.util.Collections3; -import com.nis.web.dao.systemService.ServiceConfigInfoDao; -import com.nis.web.dao.systemService.SystemServiceInfoDao; -import com.nis.web.service.CrudService; - -@Service -public class SystemServiceService extends CrudService{ - - @Autowired - private ServiceConfigInfoDao serviceConfigInfoDao; - - public void deleteService(SystemServiceInfo systemServiceInfo) { - List serviceConfigInfoList = dao.get(systemServiceInfo).getServiceConfigInfoList(); - for (ServiceConfigInfo sci : serviceConfigInfoList) { - sci.setIsValid(0); - serviceConfigInfoDao.update(sci); - } - - dao.delete(systemServiceInfo); - } - - public void save(SystemServiceInfo systemServiceInfo, List insertServiceConfigInfoList, - List updateServiceConfigInfoList) { - //新增 - if (systemServiceInfo.getId() == null) { - dao.insert(systemServiceInfo); - - if (!Collections3.isEmpty(insertServiceConfigInfoList)) { - for (ServiceConfigInfo sci : insertServiceConfigInfoList) { - serviceConfigInfoDao.insert(sci); - } - } - } - //更新 - else { - dao.update(systemServiceInfo); - - if (!Collections3.isEmpty(insertServiceConfigInfoList)) { - for (ServiceConfigInfo sci : insertServiceConfigInfoList) { - serviceConfigInfoDao.insert(sci); - } - } - if (!Collections3.isEmpty(updateServiceConfigInfoList)) { - for (ServiceConfigInfo sci : updateServiceConfigInfoList) { - serviceConfigInfoDao.update(sci); - } - } - } - - } - - public List getSystemServiceByServiceId(String serviceId) { - return dao.getSystemServiceByServiceId(serviceId); - } - -} diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 13be77073..fabfedf43 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -48,7 +48,7 @@ - +