diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 0cadc60ea..d1bcc50c1 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -61,6 +61,11 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected Integer compileIsIssued; protected String exType;//导出类型 protected String hColumns;//导出隐藏列 + + protected Integer compileIdStart;//配置ID 查询范围 开始 + protected Integer compileIdEnd;//配置ID 查询范围 结束 + protected String compileIdNew;// 查询 配置ID 范围 + protected List compileIdNewList; //查询范围（1,2,3） /** * 定时任务信息 */ @@ -108,6 +113,30 @@ public class BaseCfg extends BaseEntity implements Cloneable{ this.compileGroupMap = compileGroupMap; } + public Integer getCompileIdStart() { + return compileIdStart; + } + public void setCompileIdStart(Integer compileIdStart) { + this.compileIdStart = compileIdStart; + } + public Integer getCompileIdEnd() { + return compileIdEnd; + } + public void setCompileIdEnd(Integer compileIdEnd) { + this.compileIdEnd = compileIdEnd; + } + public String getCompileIdNew() { + return compileIdNew; + } + public void setCompileIdNew(String compileIdNew) { + this.compileIdNew = compileIdNew; + } + public List getCompileIdNewList() { + return compileIdNewList; + } + public void setCompileIdNewList(List compileIdNewList) { + this.compileIdNewList = compileIdNewList; + } /** * 编译id */ diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index 2ed0a247f..f1d8a4bca 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -484,13 +484,15 @@ public class IpMultiplexController extends CommonController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } List addrPools = ipAddrPoolCfgService.getEffectiveAddrPool(); for (IpReusePolicyCfg ipReusePolicyCfg : ipLists) { if(ipReusePolicyCfg.getAddrPoolId()!=null){ @@ -604,12 +606,15 @@ public class IpMultiplexController extends CommonController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); + + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), IpReuseDnatPolicyCfg.class); 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 4c6fe22bd..d015b66ce 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -761,6 +761,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -931,6 +941,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + and r.COMPILE_ID in @@ -1140,6 +1160,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -1241,6 +1271,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -1539,6 +1579,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 5d77ae0f7..588a514aa 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -308,6 +308,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 b3d1a0426..f0c646e21 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -164,6 +164,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 44d539907..58639ff18 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -352,6 +352,16 @@ AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 0629d63aa..da12abb00 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -234,6 +234,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 9061abb8e..57b5ebc84 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -245,6 +245,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -917,6 +927,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 8e63f0b89..2ea68eeb1 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -252,6 +252,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -696,6 +706,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -1130,6 +1150,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 bbe4f33bd..1d9ce2fb3 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -1105,6 +1105,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index 1b5f2b58d..554f0d4a9 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -128,6 +128,16 @@ AND r.compile_id=#{compileId,jdbcType=BIGINT} + + AND r.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND r.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND r.COMPILE_ID in + + #{id} + + AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR} @@ -638,6 +648,16 @@ AND a.compile_id=#{compileId,jdbcType=BIGINT} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR} diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml index b33ce612b..3a4c5ee94 100644 --- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml @@ -196,6 +196,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 ec33f8ff0..661ac8c5b 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -215,6 +215,16 @@ AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + AND a.COMPILE_ID >= #{compileIdStart,jdbcType=INTEGER} + AND a.COMPILE_ID <= #{compileIdEnd,jdbcType=INTEGER} + + + AND a.COMPILE_ID in + + #{id} + + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} 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 b9fbdb340..b0fe4db13 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -88,6 +88,29 @@ public class AppCfgService extends BaseService { protected AsnIpCfgDao asnIpCfgDao; public Page findAppPolicyList(Page page, AppPolicyCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); List list = appCfgDao.findAppPolicyList(entity); @@ -102,6 +125,29 @@ public class AppCfgService extends BaseService { public Page findAppIpList(Page page, AppIpCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); List list = appCfgDao.findAppIpList(entity); @@ -132,6 +178,29 @@ public class AppCfgService extends BaseService { } public Page findAppDomainList(Page page, AppDomainCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); List list = appCfgDao.findAppDomainList(entity); @@ -156,6 +225,29 @@ public class AppCfgService extends BaseService { // 主题网站列表 public Page findAppTopicDomainList(Page page, AppTopicDomainCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); List list = appCfgDao.findAppTopicDomainList(entity); @@ -180,6 +272,29 @@ public class AppCfgService extends BaseService { } public Page findAppSslList(Page page, AppSslCertCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); List list = appCfgDao.findAppSslList(entity); diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java index 3d1694ff6..10108f547 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -58,6 +58,29 @@ public class AppMultiFeatureCfgService extends BaseService { //分页查询 public Page findAppFeatureIndexList(Page page, AppFeatureIndex entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); List list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity); 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 49994ac48..73478b3c7 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -59,6 +59,29 @@ public class AvCfgService extends BaseService{ return avCfgDao.getAvSignSampleById(cfgId); } public Page getAvFileSampleList(Page page, AvFileSampleCfg entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index 8b2ae6421..0b42c09d9 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -72,6 +72,29 @@ public class AvContentCfgService extends BaseService{ * @return */ public Page findPage(Page page, CfgIndexInfo entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list=avContentCfgDao.findVoipList(entity); diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java index 954776b36..94b0699e7 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -64,6 +64,29 @@ public class BgpCfgService extends CrudService { return entity; } public Page getBgpList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java index 77bedde08..09cbfb034 100644 --- a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java @@ -73,6 +73,29 @@ public class CachePolicyService extends CrudService } public Page getCachePolicyUserRegionList(Page page, CachePolicyUserRegion entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); List list = commonPolicyDao.getCachePolicyUserRegionList(entity); @@ -154,6 +177,29 @@ public class CachePolicyService extends CrudService } public Page getCachePolicyList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index 854f00f05..f65c14aa8 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -661,6 +661,29 @@ public class DomainService extends CrudService { } } public Page getDomainList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index 6a7fcf8f9..ba0671d8b 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -66,6 +66,29 @@ public class FileTransferCfgService extends CrudService getFtpList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); @@ -393,6 +416,29 @@ public class FileTransferCfgService extends CrudService getFileDigestList(Page page, FileDigestCfg entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); @@ -677,6 +723,29 @@ public class FileTransferCfgService extends CrudService getP2pList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index f6d9d6971..55172e70c 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -101,6 +101,29 @@ public class HttpRedirectCfgService extends CrudService getHttpRedirectList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index af1ab9204..cb3a6b16a 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -1001,6 +1001,29 @@ public class IpCfgService extends CrudService { return msgProp; } public Page getIpCfgList(Page page, CfgIndexInfo entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); List list = ipCfgDao.getIpCfgList(entity); diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index 548588aff..7d74d9d6b 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -1,5 +1,6 @@ package com.nis.web.service.configuration; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -23,6 +24,7 @@ import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; +import com.nis.util.StringUtil; import com.nis.util.StringUtils; import com.nis.web.dao.configuration.IpMultiplexDao; import com.nis.web.security.UserUtils; @@ -37,6 +39,29 @@ public class IpMultiplexService extends BaseService{ private IpMultiplexDao ipMultiplexDao; public Page findPage(Page page, IpReusePolicyCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list=ipMultiplexDao.findPage(entity); @@ -283,6 +308,29 @@ public class IpMultiplexService extends BaseService{ } public Page findPageDnat(Page page, IpReuseDnatPolicyCfg entity) { + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); List list=ipMultiplexDao.findPageDnat(entity); diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java index c3018f40a..98fb2a20f 100644 --- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java @@ -37,6 +37,7 @@ import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.util.FileUtils; import com.nis.util.JsonMapper; +import com.nis.util.StringUtil; import com.nis.web.dao.configuration.AreaIpCfgDao; import com.nis.web.dao.configuration.MailCfgDao; import com.nis.web.dao.configuration.StringCfgDao; @@ -59,6 +60,29 @@ public class MailCfgService extends CrudService { public Page getMailList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index edab676ee..fa17c38c0 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.nis.domain.Page; +import com.nis.domain.SysUser; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; @@ -165,6 +166,29 @@ public class WebsiteCfgService extends CrudService { return entity; } public Page getWebsiteList(Page page, CfgIndexInfo entity){ + //配置ID 查询条件 查询范围的处理 + String compileIdNew =entity.getCompileIdNew(); + if(!StringUtil.isEmpty(compileIdNew)){ + if(compileIdNew.indexOf("-")!=-1){//包含 + String[] split = compileIdNew.split("-"); + if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){ + entity.setCompileIdStart(Integer.parseInt(split[0])); + entity.setCompileIdEnd(Integer.parseInt(split[1])); + }else{ + entity.setCompileIdStart(Integer.parseInt(split[1])); + entity.setCompileIdEnd(Integer.parseInt(split[0])); + } + }else if(compileIdNew.indexOf(",")!=-1){ + String[] split = compileIdNew.split(","); + List idList=new ArrayList(); + for (int i = 0; i < split.length; i++) { + idList.add(split[i]); + } + entity.setCompileIdNewList(idList); + }else{ + entity.setCompileId(Integer.parseInt(compileIdNew)); + } + } // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index b66cdfb08..3a9dfc592 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -12,8 +12,8 @@ $("#intype").val("${cfg.cfgDesc}"); }else if("${cfg.cfgKeywords}"){ $("#intype").val("${cfg.cfgKeywords}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -126,7 +126,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 3c0baf1d5..4871c31e7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -14,8 +14,8 @@ $("#intype").val("${cfg.destPort}"); } else if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - } else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + } else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); } else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -130,7 +130,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp index 764aa57ea..1d7487ed2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipCfg.destIpAddress}"){ $("#intype").val("${cfg.ipCfg.destIpAddress}"); }else if("${cfg.strCfg.cfgKeywords}"){ @@ -187,7 +187,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 18ded5bc4..82afa40e3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -181,7 +181,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index a67a9ba8b..d8d4b0ac9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -12,8 +12,8 @@ $("#intype").val("${cfg.cfgDesc}"); }else if("${cfg.cfgKeywords}"){ $("#intype").val("${cfg.cfgKeywords}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -109,7 +109,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp index abf9a5123..39889ec8e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -12,8 +12,8 @@ $("#intype").val("${cfg.cfgDesc}"); }else if("${cfg.cfgKeywords}"){ $("#intype").val("${cfg.cfgKeywords}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -125,7 +125,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 60b883acb..d9fa60f86 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -22,8 +22,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -178,7 +178,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 3e601a586..bbefac273 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -8,8 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -105,7 +105,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index c35324542..a177ab0b7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -22,8 +22,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -99,6 +99,11 @@ $("#"+openId).show(); $("#"+closeId).parent().parent().next("tr").hide(); }); + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -143,6 +148,8 @@ + + - + diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index aaa0aafb8..7c96657be 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -184,7 +184,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index dbc1538aa..8302fb491 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -181,7 +181,7 @@ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 13d5b63ac..8e693ca7e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -176,7 +176,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index 2f764116e..308e5d166 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -151,7 +151,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 9f43c56b6..67fa60e5e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -165,7 +165,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 644a47fd6..1d766e257 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -174,7 +174,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 4ef3ad3c4..2d5ee098c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -162,7 +162,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 2786a4b48..bfb162e53 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -10,8 +10,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -164,7 +164,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp index 41a00dace..216e244e2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.srcIpAddress}"){ $("#intype").val("${cfg.srcIpAddress}"); }else if("${cfg.srcPort}"){ @@ -133,7 +133,7 @@ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp index 7e920966d..10ef8101a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp @@ -15,8 +15,8 @@ $("#intype").val("${cfg.userName}"); }else if("${cfg.srcIpAddress}"){ $("#intype").val("${cfg.srcIpAddress}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -123,7 +123,7 @@ - + <%-- --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index c2d505eb4..b0f412d48 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -165,7 +165,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp index a3151175a..e7d4003a5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.strCfg.cfgKeywords}"){ $("#intype").val("${cfg.strCfg.cfgKeywords}"); }else{ @@ -84,6 +84,11 @@ $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); }); + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -122,6 +127,8 @@ + + - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index f875bfd3c..8a45cea43 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -358,7 +358,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index b6f689f79..7bb5e65c3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -163,7 +163,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index 038fe080a..0c3fd272f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -316,7 +316,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 1df1576c8..cd159c01b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -162,7 +162,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index d4b36260d..c215c60b6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.httpUrl.cfgKeywords}"){ $("#intype").val("${cfg.httpUrl.cfgKeywords}"); }else{ @@ -145,7 +145,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index b198df2e4..2f6368931 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -9,8 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.compileId}"){ - $("#intype").val("${cfg.compileId}"); + }else if("${cfg.compileIdNew}"){ + $("#intype").val("${cfg.compileIdNew}"); }else if("${cfg.ipPort.srcIpAddress}"){ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ @@ -160,7 +160,7 @@ - + <%-- diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index 908f74bb3..f3d76558a 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -24,6 +24,16 @@ }); }(jQuery)); +//cfgId 新增配置ID查询条件验证 1,2,3 1-3 +jQuery.validator.addMethod("compileIdCheck",function(value,element){ + var flagTypeSame=true; + if(this.optional(element) || /^(\d+,)*\d+$/.test(value) || /^(\d+-)?\d+$/.test(value)){ + flagTypeSame=true; + }else{ + flagTypeSame=false; + } + return flagTypeSame ; +},$.validator.messages.compileIdCheck); jQuery.validator.addMethod("hexCheck", function(value, element) { return this.optional(element) || /^([0-9|a-f|A-F]*)$/.test(value); }, $.validator.messages.hexCheck); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index 10a80a420..75d4b37ff 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -92,6 +92,7 @@ protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!", log_no_data:"This hour no data", expireTip:"Start time and end time interval is at least 1 minute", - compareTip:"Start time should not be less than the current time plus 2 minutes." + compareTip:"Start time should not be less than the current time plus 2 minutes.", + compileIdCheck:"Please enter the correct query format" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index 84615a9af..3353a4757 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -92,6 +92,7 @@ protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!", log_no_data:"Нет данных за этот час", expireTip:"Start time and end time interval is at least 1 minute", - compareTip:"Start time should not be less than the current time plus 2 minutes." + compareTip:"Start time should not be less than the current time plus 2 minutes.", + compileIdCheck:"Please enter the correct query format" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index 981daba6e..104ce97e0 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -92,6 +92,7 @@ protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！", log_no_data:"本小时无数据", expireTip:"开始时间结束时间间隔至少为1分钟", - compareTip:"开始时间不能小于当前时间加上2分钟 " + compareTip:"开始时间不能小于当前时间加上2分钟 ", + compileIdCheck:"请输入正确的查询格式" }); }(jQuery)); diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 423ef31e4..9be15efb1 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -739,25 +739,25 @@ window.onload=function(){ $("div[class='content content5']").find("label:lt(1)").addClass("keyword-disinline");//page.css 关键词换行 }) // 配置id的搜索下拉框选择切换 - if ($("#searchForm #seltype").val() == 'compileId') { - $("#searchForm #intype").addClass("number"); + if ($("#searchForm #seltype").val() == 'compileIdNew') { + $("#searchForm #intype").addClass("compileIdCheck"); } else { - $("#searchForm #intype").removeClass("number"); + $("#searchForm #intype").removeClass("compileIdCheck"); } // reset时去掉number $("#resetBtn").on("click", function() { - if ($("#searchForm #seltype").val() == 'compileId') { - $("#searchForm #intype").addClass("number"); + if ($("#searchForm #seltype").val() == 'compileIdNew') { + $("#searchForm #intype").addClass("compileIdCheck"); } else { - $("#searchForm #intype").removeClass("number"); + $("#searchForm #intype").removeClass("compileIdCheck"); } }); // 切换时为compileId加上number $("#searchForm #seltype").on("change", function() { - if ($("#searchForm #seltype").val() == 'compileId') { - $("#searchForm #intype").addClass("number"); + if ($("#searchForm #seltype").val() == 'compileIdNew') { + $("#searchForm #intype").addClass("compileIdCheck"); } else { - $("#searchForm #intype").removeClass("number"); + $("#searchForm #intype").removeClass("compileIdCheck"); } });