diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index d1bcc50c1..6ccfbba1d 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -62,10 +62,8 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected String exType;//导出类型 protected String hColumns;//导出隐藏列 - protected Integer compileIdStart;//配置ID 查询范围 开始 - protected Integer compileIdEnd;//配置ID 查询范围 结束 protected String compileIdNew;// 查询 配置ID 范围 - protected List compileIdNewList; //查询范围(1,2,3) + /** * 定时任务信息 */ @@ -112,31 +110,13 @@ public class BaseCfg extends BaseEntity implements Cloneable{ public void setCompileGroupMap(Map compileGroupMap) { 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/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index d015b66ce..3cc5bd7dc 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -761,16 +761,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -941,16 +950,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + and r.COMPILE_ID in @@ -1160,16 +1178,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -1271,16 +1298,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -1579,16 +1615,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 588a514aa..05cfddc32 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -308,16 +308,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 f0c646e21..6602ceda9 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -164,16 +164,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 58639ff18..f6010441b 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -352,16 +352,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 da12abb00..951507015 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -234,16 +234,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 57b5ebc84..9a6ede3e4 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -245,16 +245,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -927,16 +936,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 2ea68eeb1..07be2eeea 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -252,16 +252,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -706,16 +715,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -1150,16 +1168,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 1d9ce2fb3..06db8585e 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -1105,16 +1105,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 554f0d4a9..7bcfbfc74 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -128,15 +128,24 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND r.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND r.COMPILE_ID in - + #{id} + + + AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR} @@ -648,15 +657,24 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} 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 3a4c5ee94..f51a93e48 100644 --- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml @@ -196,16 +196,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 661ac8c5b..91e781bbd 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -215,16 +215,25 @@ 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 >= #{item,jdbcType=INTEGER} + + + AND a.COMPILE_ID <= #{item,jdbcType=INTEGER} + + - + AND a.COMPILE_ID in - + #{id} + + AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER} + 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 b0fe4db13..b9fbdb340 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -88,29 +88,6 @@ 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); @@ -125,29 +102,6 @@ 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); @@ -178,29 +132,6 @@ 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); @@ -225,29 +156,6 @@ 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); @@ -272,29 +180,6 @@ 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 10108f547..3d1694ff6 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -58,29 +58,6 @@ 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 73478b3c7..49994ac48 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -59,29 +59,6 @@ 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 0b42c09d9..8b2ae6421 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -72,29 +72,6 @@ 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 94b0699e7..954776b36 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -64,29 +64,6 @@ 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 09cbfb034..77bedde08 100644 --- a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java @@ -73,29 +73,6 @@ 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); @@ -177,29 +154,6 @@ 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 f65c14aa8..854f00f05 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -661,29 +661,6 @@ 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 ba0671d8b..6a7fcf8f9 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -66,29 +66,6 @@ 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); @@ -416,29 +393,6 @@ 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); @@ -723,29 +677,6 @@ 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 55172e70c..f6d9d6971 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -101,29 +101,6 @@ 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 cb3a6b16a..af1ab9204 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -1001,29 +1001,6 @@ 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 7d74d9d6b..548588aff 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -1,6 +1,5 @@ package com.nis.web.service.configuration; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -24,7 +23,6 @@ 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; @@ -39,29 +37,6 @@ 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); @@ -308,29 +283,6 @@ 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 98fb2a20f..c3018f40a 100644 --- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java @@ -37,7 +37,6 @@ 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; @@ -60,29 +59,6 @@ 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 fa17c38c0..edab676ee 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -12,7 +12,6 @@ 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; @@ -166,29 +165,6 @@ 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/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 f3d76558a..2487196bc 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 @@ -29,6 +29,14 @@ jQuery.validator.addMethod("compileIdCheck",function(value,element){ var flagTypeSame=true; if(this.optional(element) || /^(\d+,)*\d+$/.test(value) || /^(\d+-)?\d+$/.test(value)){ flagTypeSame=true; + if(/^(\d+-)?\d+$/.test(value)){ + var strArr=value.split("-"); + if(Number(strArr[0])>Number(strArr[1])){ + flagTypeSame=false; + }else{ + flagTypeSame=true; + } + } }else{ flagTypeSame=false; }