diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 061220f90..bf6e934eb 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3319,7 +3319,6 @@ public class BaseController { page.setPageNo(1); page.setLastPage(false); - // 只有未审核的配置可删除 CfgIndexInfo searchCfg = new CfgIndexInfo(); AppPolicyCfg searchAppCfg=new AppPolicyCfg(); FileDigestCfg searchDigestCfg=new FileDigestCfg(); @@ -3339,107 +3338,117 @@ public class BaseController { PxyObjTrustedCaCert searchTrustedCaCertCfg=new PxyObjTrustedCaCert(); AsnIpCfg searchAsnIpCfg=new AsnIpCfg(); + // 未审核或取消审核通过的配置可删除 + Integer searchAuditValue = (Integer)Reflections.invokeGetter(entity, "isAudit"); + if(searchAuditValue != null) { + if(searchAuditValue != 3 && searchAuditValue != 0) { + searchAuditValue = 30; + } + }else { + searchAuditValue = 30; + } + // 传递检索条件 if(entity != null && (entity instanceof CfgIndexInfo)) { BeanUtils.copyProperties(entity, searchCfg); searchCfg.setIsValid(0); - searchCfg.setIsAudit(0); + searchCfg.setIsAudit(searchAuditValue); // 检索isValid = 0 AND (isAudit = 0 OR 3) searchCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppPolicyCfg)) { BeanUtils.copyProperties(entity, searchAppCfg); searchAppCfg.setIsValid(0); - searchAppCfg.setIsAudit(0); + searchAppCfg.setIsAudit(searchAuditValue); searchAppCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof FileDigestCfg)) { BeanUtils.copyProperties(entity, searchDigestCfg); searchDigestCfg.setIsValid(0); - searchDigestCfg.setIsAudit(0); + searchDigestCfg.setIsAudit(searchAuditValue); searchDigestCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AvFileSampleCfg)) { BeanUtils.copyProperties(entity, searchFileSampleCfg); searchFileSampleCfg.setIsValid(0); - searchFileSampleCfg.setIsAudit(0); + searchFileSampleCfg.setIsAudit(searchAuditValue); searchFileSampleCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof DdosIpCfg)) { BeanUtils.copyProperties(entity, searchDdosIpCfg); searchDdosIpCfg.setIsValid(0); - searchDdosIpCfg.setIsAudit(0); + searchDdosIpCfg.setIsAudit(searchAuditValue); searchDdosIpCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppHttpCfg)) { BeanUtils.copyProperties(entity, searchAppHttpCfg); searchAppHttpCfg.setIsValid(0); - searchAppHttpCfg.setIsAudit(0); + searchAppHttpCfg.setIsAudit(searchAuditValue); searchAppHttpCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppHttpCfg)) { BeanUtils.copyProperties(entity, searchAppHttpCfg); searchAppHttpCfg.setIsValid(0); - searchAppHttpCfg.setIsAudit(0); + searchAppHttpCfg.setIsAudit(searchAuditValue); searchAppHttpCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppDomainCfg)) { BeanUtils.copyProperties(entity, searchAppDomainCfg); searchAppDomainCfg.setIsValid(0); - searchAppDomainCfg.setIsAudit(0); + searchAppDomainCfg.setIsAudit(searchAuditValue); searchAppDomainCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppTopicDomainCfg)) { BeanUtils.copyProperties(entity, searchAppTopicCfg); searchAppTopicCfg.setIsValid(0); - searchAppTopicCfg.setIsAudit(0); + searchAppTopicCfg.setIsAudit(searchAuditValue); searchAppTopicCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppSslCertCfg)) { BeanUtils.copyProperties(entity, searchAppSslCertCfg); searchAppSslCertCfg.setIsValid(0); - searchAppSslCertCfg.setIsAudit(0); + searchAppSslCertCfg.setIsAudit(searchAuditValue); searchAppSslCertCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppIpCfg)) { BeanUtils.copyProperties(entity, searchAppIpCfg); searchAppIpCfg.setIsValid(0); - searchAppIpCfg.setIsAudit(0); + searchAppIpCfg.setIsAudit(searchAuditValue); searchAppIpCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AppFeatureIndex)) { BeanUtils.copyProperties(entity, searchAppFeatureIndex); searchAppFeatureIndex.setIsValid(0); - searchAppFeatureIndex.setIsAudit(0); + searchAppFeatureIndex.setIsAudit(searchAuditValue); searchAppFeatureIndex.setFunctionId(functionId); } if(entity != null && (entity instanceof DnsResStrategy)) { BeanUtils.copyProperties(entity, searchDnsResStrategy); searchDnsResStrategy.setIsValid(0); - searchDnsResStrategy.setIsAudit(0); + searchDnsResStrategy.setIsAudit(searchAuditValue); searchDnsResStrategy.setFunctionId(functionId); } if(entity != null && (entity instanceof DnsIpCfg)) { BeanUtils.copyProperties(entity, searchDnsIpCfg); searchDnsIpCfg.setIsValid(0); - searchDnsIpCfg.setIsAudit(0); + searchDnsIpCfg.setIsAudit(searchAuditValue); searchDnsIpCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof PxyObjKeyring)) { BeanUtils.copyProperties(entity, searchObjKeyringCfg); searchObjKeyringCfg.setIsValid(0); - searchObjKeyringCfg.setIsAudit(0); + searchObjKeyringCfg.setIsAudit(searchAuditValue); searchObjKeyringCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof PxyObjTrustedCaCert)) { BeanUtils.copyProperties(entity, searchTrustedCaCertCfg); searchTrustedCaCertCfg.setIsValid(0); - searchTrustedCaCertCfg.setIsAudit(0); + searchTrustedCaCertCfg.setIsAudit(searchAuditValue); searchTrustedCaCertCfg.setFunctionId(functionId); } if(entity != null && (entity instanceof AsnIpCfg)) { BeanUtils.copyProperties(entity, searchAsnIpCfg); searchAsnIpCfg.setIsValid(0); - searchAsnIpCfg.setIsAudit(0); + searchAsnIpCfg.setIsAudit(searchAuditValue); searchAsnIpCfg.setFunctionId(functionId); } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index 7fd5af05e..34c793baa 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -135,7 +135,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 70f1a13fd..16869d2f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -734,7 +734,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -929,7 +934,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -1057,7 +1067,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -1157,7 +1172,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -1277,7 +1297,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -1594,7 +1619,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml index ef4eabc44..ffbcec180 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -280,7 +280,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index 6602ceda9..20556ec75 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -135,7 +135,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index e2b1d11e6..5c9173eba 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -317,7 +317,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml index 294ffe75b..e1151db3d 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -215,7 +215,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index d46d4837a..f160165fe 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -226,7 +226,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml index 7e9126cdf..4c32b3643 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml @@ -124,7 +124,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index bc3c12fcc..c19a1c667 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -127,7 +127,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index 9b9451376..aef61d9f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -92,7 +92,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index ceda6acad..985ab311c 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -233,7 +233,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -1147,7 +1152,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') 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 334b6c97e..d1ed7a539 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -1105,7 +1105,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index e19d26e08..86cfde9c3 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -178,7 +178,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') @@ -261,7 +266,12 @@ AND r.IS_VALID != -1 - AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index 8aa9b44ed..47cec8f63 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -196,7 +196,12 @@ AND a.IS_VALID != -1 - AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1)) + + + AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')