diff --git a/src/main/java/com/nis/domain/configuration/DnsResStrategy.java b/src/main/java/com/nis/domain/configuration/DnsResStrategy.java index 6c08485d6..ba5b6e5e9 100644 --- a/src/main/java/com/nis/domain/configuration/DnsResStrategy.java +++ b/src/main/java/com/nis/domain/configuration/DnsResStrategy.java @@ -34,7 +34,21 @@ public class DnsResStrategy extends BaseCfg { private String miTtlmax; //仅作导入使用 private String ttl; + @ExcelField(title="policy_number",sort=0) + private String dnsId; + + + public String getDnsId() { + return dnsId; + } + + + public void setDnsId(String dnsId) { + this.dnsId = dnsId; + } + + public String getTtl() { return ttl; } diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 597e3cda3..b421742ac 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1617,20 +1617,20 @@ public class AppCfgController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByPolicyList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppPolicyList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppPolicyList(pageInfo, entity); - for(AppPolicyCfg policy:page.getList()){ + + for(AppPolicyCfg policy:ipLists){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId()); if(app!=null) { policy.setSocialName(app.getSpecServiceName()); @@ -1648,7 +1648,7 @@ public class AppCfgController extends BaseController { second.setIsLeaf(1); List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); //遍历，找到匹配项后将行为设置进去 - for(AppPolicyCfg policy:page.getList()){ + for(AppPolicyCfg policy:ipLists){ if(policy.getBehavCode()==null) continue; for(SpecificServiceCfg secondCfg:secondList) { if(secondCfg.getSpecServiceCode()==null) continue; @@ -1678,13 +1678,13 @@ public class AppCfgController extends BaseController { noExportMap.put("NTC_SUBSCRIBE_ID", subscribeInfoNoExport); List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); - for (AppPolicyCfg cfg : page.getList()) { + for (AppPolicyCfg cfg : ipLists) { AppPolicyCfg cfgIndexInfo=appCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); } subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); @@ -1707,21 +1707,21 @@ public class AppCfgController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByTopicDomainList(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppTopicDomainList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppTopicDomainList(pageInfo, entity); - for (int i = 0; i < page.getList().size(); i++) { - AppTopicDomainCfg appTop=page.getList().get(i); + + for (int i = 0; i < ipLists.size(); i++) { + AppTopicDomainCfg appTop=ipLists.get(i); appTop.setIsHex(appTop.getIsHexbin()); appTop.setIsCaseInsenstive(appTop.getIsHexbin()); } @@ -1729,7 +1729,7 @@ public class AppCfgController extends BaseController { classMap.put(entity.getMenuNameCode(), AppTopicDomainCfg.class); String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { @@ -1750,21 +1750,20 @@ public class AppCfgController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByIpList(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppIpList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppIpList(pageInfo, entity); - for(AppIpCfg appIp:page.getList()){ + + + for(AppIpCfg appIp:ipLists){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(appIp.getSpecServiceId()); appIp.setAppName(app.getSpecServiceName()); } @@ -1772,7 +1771,7 @@ public class AppCfgController extends BaseController { classMap.put(entity.getMenuNameCode(), AppIpCfg.class); String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { @@ -1792,22 +1791,19 @@ public class AppCfgController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByHttpList(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppHttpList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppHttpList(pageInfo, entity); - for(AppHttpCfg http:page.getList()){ + + for(AppHttpCfg http:ipLists){ http.setIsHex(http.getIsHexbin()); http.setIsCaseInsenstive(http.getIsHexbin()); http.setCfgKeywords(Functions.replace(http.getCfgKeywords(), "***and***"," ")); @@ -1819,7 +1815,7 @@ public class AppCfgController extends BaseController { classMap.put(entity.getMenuNameCode(), AppHttpCfg.class); String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { @@ -1840,21 +1836,17 @@ public class AppCfgController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists= new ArrayList(); + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByDomainList(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppDomainList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppDomainList(pageInfo, entity); - for(AppDomainCfg domain:page.getList()){ + for(AppDomainCfg domain:ipLists){ domain.setIsHex(domain.getIsHexbin()); domain.setIsCaseInsenstive(domain.getIsHexbin()); SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(domain.getSpecServiceId()); @@ -1865,7 +1857,7 @@ public class AppCfgController extends BaseController { classMap.put(entity.getMenuNameCode(), AppDomainCfg.class); String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { @@ -1886,21 +1878,18 @@ public class AppCfgController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); - } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); + List ipLists= new ArrayList(); + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppBySslList(ids); + }else{ Page pageInfo=new Page(request, response,"r"); pageInfo.setPageNo(1); pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = appCfgService.findAppSslList(pageInfo, entity); - for(AppSslCertCfg ssl:page.getList()){ + ipLists=page.getList(); + } + + for(AppSslCertCfg ssl:ipLists){ ssl.setIsHex(ssl.getIsHexbin()); ssl.setIsCaseInsenstive(ssl.getIsHexbin()); ssl.setCfgKeywords(Functions.replace(ssl.getCfgKeywords(), "***and***"," ")); @@ -1911,7 +1900,7 @@ public class AppCfgController extends BaseController { classMap.put(entity.getMenuNameCode(), AppSslCertCfg.class); String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index 91d6726aa..265112aac 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -46,6 +46,7 @@ import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; +import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.WebsiteDomainTopic; import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult.ResponseData; @@ -300,22 +301,19 @@ public class AppFeatureCfgController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); - } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appMultiFeatureCfgService.findAppByFeatureIndexList(ids); + }else{ Page pageInfo=new Page(request, response,"r"); pageInfo.setPageNo(1); pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = appMultiFeatureCfgService.findAppFeatureIndexList(pageInfo, entity); - for(AppFeatureIndex feature:page.getList()){ + ipLists=page.getList(); + } + + for(AppFeatureIndex feature:ipLists){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId()); feature.setAppName(app.getSpecServiceName()); } @@ -334,7 +332,7 @@ public class AppFeatureCfgController extends BaseController { List ipList=new ArrayList(); List keywordList=new ArrayList(); List strList=new ArrayList(); - for (AppFeatureIndex cfg : page.getList()) { + for (AppFeatureIndex cfg : ipLists) { Map maps=appMultiFeatureCfgService.exportFeature(cfg); if(entity.getFunctionId()!=567){ keywordList.addAll(maps.get("APP_KEYWORDS")); @@ -343,7 +341,7 @@ public class AppFeatureCfgController extends BaseController { } ipList.addAll(maps.get("APP_IP_RANGE")); } - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); if(entity.getFunctionId()!=564 && entity.getFunctionId()!=567 ){ keywordList=replaceKeyList(keywordList); titleList.add("APP_IP_RANGE"); diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index a7090d75d..03f8275f5 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -258,20 +258,20 @@ public class BasicProtocolController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByPolicyList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppPolicyList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppPolicyList(pageInfo, entity); - for(AppPolicyCfg policy:page.getList()){ + for(AppPolicyCfg policy:ipLists){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId()); if(app!=null) { policy.setAppName(app.getSpecServiceName()); @@ -298,13 +298,13 @@ public class BasicProtocolController extends BaseController { noExportMap.put("NTC_SUBSCRIBE_ID", subscribeInfoNoExport); List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); - for (AppPolicyCfg cfg : page.getList()) { + for (AppPolicyCfg cfg : ipLists) { AppPolicyCfg cfgIndexInfo=appCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); } subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index 42cffdc93..1144e00b4 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -278,20 +278,19 @@ public class EncryptedTunnelBehaviorController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=appCfgService.findAppByPolicyList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = appCfgService.findAppPolicyList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = appCfgService.findAppPolicyList(pageInfo, entity); - for(AppPolicyCfg policy:page.getList()){ + for(AppPolicyCfg policy:ipLists){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId()); if(app!=null) { policy.setBehaviorName(app.getSpecServiceName()); @@ -309,7 +308,7 @@ public class EncryptedTunnelBehaviorController extends BaseController { second.setIsLeaf(1); List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); //遍历，找到匹配项后将行为设置进去 - for(AppPolicyCfg policy:page.getList()){ + for(AppPolicyCfg policy:ipLists){ if(policy.getBehavCode()==null) continue; for(SpecificServiceCfg secondCfg:secondList) { if(secondCfg.getSpecServiceCode()==null) continue; @@ -339,13 +338,13 @@ public class EncryptedTunnelBehaviorController extends BaseController { noExportMap.put("NTC_SUBSCRIBE_ID", subscribeInfoNoExport); List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); - for (AppPolicyCfg cfg : page.getList()) { + for (AppPolicyCfg cfg : ipLists) { AppPolicyCfg cfgIndexInfo=appCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); } subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index ea54f8abc..76f7e971e 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -24,6 +24,7 @@ import com.nis.domain.Page; import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.DnsIpCfg; import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.IpPortCfg; @@ -212,32 +213,30 @@ public class DnsIpCfgController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=dnsIpCfgService.findByPage(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = dnsIpCfgService.findPage(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = dnsIpCfgService.findPage(pageInfo, entity); - for (int i = 0; i < page.getList().size(); i++) { - if(StringUtil.isEmpty(page.getList().get(i).getDnsStrategyName())){ + + for (int i = 0; i < ipLists.size(); i++) { + if(StringUtil.isEmpty(ipLists.get(i).getDnsStrategyName())){ Properties msgProp = getMsgProp(); - page.getList().get(i).setDnsStrategyName(msgProp.getProperty("default_group")); + ipLists.get(i).setDnsStrategyName(msgProp.getProperty("default_group")); } } - model.addAttribute("page", page); titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DnsIpCfg.class); String cfgIndexInfoNoExport=",whether_area_block,client_ip,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 9746c03e6..7cf5f23a1 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -22,6 +22,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.AppSslCertCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.specific.SpecificServiceCfg; @@ -184,29 +185,27 @@ public class DnsResStrategyController extends BaseController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=dnsResStrategyService.findByPage(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = dnsResStrategyService.findPage(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = dnsResStrategyService.findPage(pageInfo, entity); - for (int i = 0; i < page.getList().size(); i++) { - page.getList().get(i).setMiTtlmax(String.valueOf(page.getList().get(i).getMinTtl())+"-"+String.valueOf(page.getList().get(i).getMaxTtl())); + + for (int i = 0; i < ipLists.size(); i++) { + ipLists.get(i).setMiTtlmax(String.valueOf(ipLists.get(i).getMinTtl())+"-"+String.valueOf(ipLists.get(i).getMaxTtl())); + ipLists.get(i).setDnsId( String.valueOf(ipLists.get(i).getCfgId())); } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DnsResStrategy.class); - String cfgIndexInfoNoExport=",valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport=",cfg_id,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index 6660224e7..9766cd83e 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -148,7 +148,18 @@ public class DdosCfgController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ddosCfgService.findByPage(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ddosCfgService.findPage(pageInfo, entity); + ipLists=page.getList(); + } /*//导出选中记录 * if(!StringUtil.isEmpty(ids)){ for(String id:ids.split(",")){ @@ -157,16 +168,12 @@ public class DdosCfgController extends BaseController { //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); }else{*/ //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ddosCfgService.findPage(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DdosIpCfg.class); String cfgIndexInfoNoExport=",do_log,client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index a9b91f6ec..a2be7c3e0 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -968,29 +968,27 @@ public class AvContentController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + if(entity.getIpPort()== null){ + entity.setIpPort(new IpPortCfg()); + } + if(entity.getAvContUrlCfgList()== null){ + entity.setAvContUrlCfg(new AvContUrlCfg());; + } + if(entity.getNtcSubscribeIdCfg()==null){ + entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); + } + Page page = avContentCfgService.findPage(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - if(entity.getIpPort()== null){ - entity.setIpPort(new IpPortCfg()); - } - if(entity.getAvContUrlCfgList()== null){ - entity.setAvContUrlCfg(new AvContUrlCfg());; - } - if(entity.getNtcSubscribeIdCfg()==null){ - entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); - } - Page page = avContentCfgService.findPage(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_STREAMING_MEDIA_URL"); @@ -1021,7 +1019,7 @@ public class AvContentController extends BaseController { List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); List streamurlList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=avContentCfgService.exportstream(cfg); ipList.addAll(maps.get("NTC_UNIVERSAL_IP")); streamurlList.addAll(maps.get("NTC_STREAMING_MEDIA_URL")); @@ -1029,7 +1027,7 @@ public class AvContentController extends BaseController { } subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); streamurlList=BaseStringCfg.replaceBaseKeyList(streamurlList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_UNIVERSAL_IP", ipList); dataMap.put("NTC_STREAMING_MEDIA_URL", streamurlList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); @@ -1054,28 +1052,28 @@ public class AvContentController extends BaseController { Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + if(entity.getIpPort()== null){ + entity.setIpPort(new IpPortCfg()); + } + if(entity.getVoipAccount()== null){ + entity.setVoipAccount(new AvVoipAccountCfg()); + } + if(entity.getNtcSubscribeIdCfg()==null){ + entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); + } + Page page = avContentCfgService.findPage(new Page(request, response,"r"), entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - if(entity.getIpPort()== null){ - entity.setIpPort(new IpPortCfg()); - } - if(entity.getVoipAccount()== null){ - entity.setVoipAccount(new AvVoipAccountCfg()); - } - if(entity.getNtcSubscribeIdCfg()==null){ - entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); - } - Page page = avContentCfgService.findPage(new Page(request, response,"r"), entity); + titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_VOIP_ACCOUNT"); @@ -1106,7 +1104,7 @@ public class AvContentController extends BaseController { List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); List countlList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=avContentCfgService.exportvoip(cfg); ipList.addAll(maps.get("NTC_UNIVERSAL_IP")); countlList.addAll(maps.get("NTC_VOIP_ACCOUNT")); @@ -1114,7 +1112,7 @@ public class AvContentController extends BaseController { } countlList=BaseStringCfg.replaceBaseKeyList(countlList); subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); dataMap.put("NTC_UNIVERSAL_IP", ipList); dataMap.put("NTC_VOIP_ACCOUNT", countlList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 3402ff801..5d2bf2264 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -195,19 +195,18 @@ public class BgpCfgController extends BaseController{ Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = bgpCfgService.getBgpList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = bgpCfgService.getBgpList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); titleList.add("NTC_BGP_AS"); @@ -236,7 +235,7 @@ public class BgpCfgController extends BaseController{ List ipList=new ArrayList(); // List subscribeInfoList=new ArrayList(); List asInfoList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { CfgIndexInfo cfgIndexInfo=bgpCfgService.exportbgp(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); // subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); @@ -244,7 +243,7 @@ public class BgpCfgController extends BaseController{ } asInfoList=BaseStringCfg.replaceBaseKeyList(asInfoList); // subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList); dataMap.put("NTC_BGP_AS", asInfoList); // dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index ca798ead9..6a9b631d1 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -617,20 +617,19 @@ public class FileTransferCfgController extends BaseController{ Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = fileTransferCfgService.getFtpList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = fileTransferCfgService.getFtpList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_FTP_URL"); @@ -665,7 +664,7 @@ public class FileTransferCfgController extends BaseController{ List subscribeInfoList=new ArrayList(); List ftpkeyList=new ArrayList(); List ftpurlList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=fileTransferCfgService.exportftp(cfg); ftpkeyList.addAll(maps.get("NTC_FTP_CONTENT")); ftpurlList.addAll(maps.get("NTC_FTP_URL")); @@ -675,7 +674,7 @@ public class FileTransferCfgController extends BaseController{ subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); ftpkeyList=BaseStringCfg.replaceBaseKeyList(ftpkeyList); ftpurlList=BaseStringCfg.replaceBaseKeyList(ftpurlList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_UNIVERSAL_IP", ipList); dataMap.put("NTC_FTP_URL", ftpurlList); dataMap.put("NTC_FTP_CONTENT", ftpkeyList); @@ -701,19 +700,19 @@ public class FileTransferCfgController extends BaseController{ Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = fileTransferCfgService.getP2pList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = fileTransferCfgService.getP2pList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); @@ -753,7 +752,7 @@ public class FileTransferCfgController extends BaseController{ List subscribeInfoList=new ArrayList(); List hashList=new ArrayList(); List keywordList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=fileTransferCfgService.exportp2p(cfg); keywordList.addAll(maps.get("NTC_P2P_KEYWORDS")); hashList.addAll(maps.get("NTC_P2P_HASH_BIN")); @@ -763,7 +762,7 @@ public class FileTransferCfgController extends BaseController{ subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); keywordList=BaseStringCfg.replaceBaseKeyList(keywordList); hashList=BaseStringCfg.replaceBaseKeyList(hashList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_UNIVERSAL_IP", ipList); dataMap.put("NTC_P2P_KEYWORDS", keywordList); dataMap.put("NTC_P2P_HASH_BIN", hashList); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 39cc183b9..29f557025 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -435,19 +435,18 @@ public class IpController extends BaseController{ Map noExportMap=new HashMap(); - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipCfgService.getIpCfgList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.getIpCfgList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); titleList.add("asn_policy"); @@ -465,7 +464,7 @@ public class IpController extends BaseController{ noExportMap.put("asn_policy", asnGroupInfoNoExport); List ipList=new ArrayList(); List groupInfoList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); if(!StringUtil.isEmpty(cfgIndexInfo.getAsnIpGroupName())){ @@ -475,7 +474,7 @@ public class IpController extends BaseController{ groupInfoList.add(group); } } - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList); dataMap.put("asn_policy", groupInfoList); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index 7368b61a8..0600369d3 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -234,20 +234,19 @@ public class MailCfgController extends BaseController{ Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = mailCfgService.getMailList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = mailCfgService.getMailList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" @@ -287,7 +286,7 @@ public class MailCfgController extends BaseController{ List subscribeInfoList=new ArrayList(); List mailBodyList=new ArrayList(); List mailReqHdrList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=mailCfgService.exportmail(cfg); mailReqHdrList.addAll(maps.get("NTC_MAIL_HDR")); mailBodyList.addAll(maps.get("NTC_MAIL_BODY")); @@ -304,7 +303,7 @@ public class MailCfgController extends BaseController{ } } - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_MAIL_HDR", mailReqHdrList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); /*}*/ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 60e8373fd..90b7f2d2d 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -638,18 +638,19 @@ public class WebsiteController extends BaseController{ List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); - /*//导出选中记录 - if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ //条件导出数据大于最大导出数，只导出最大导出条数 - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity); + String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + ",config_time,editor,edit_time,auditor,audit_time" @@ -686,7 +687,7 @@ public class WebsiteController extends BaseController{ List httpResBodyList = new ArrayList<>(); List ipPortList = new ArrayList<>(); List subscribeIdList = new ArrayList<>(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=websiteCfgService.exportHttpCfg(cfg); httpUrlList.addAll(maps.get("NTC_HTTP_URL")); httpReqHdrList.addAll(maps.get("NTC_HTTP_REQ_HDR")); @@ -705,7 +706,7 @@ public class WebsiteController extends BaseController{ titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); if(entity.getFunctionId()!=635){ titleList.add("NTC_HTTP_URL"); @@ -759,36 +760,35 @@ public class WebsiteController extends BaseController{ Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = websiteCfgService.getWebsiteList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = websiteCfgService.getWebsiteList(pageInfo, entity); - for (int i = 0; i < page.getList().size(); i++) { + + for (int i = 0; i < ipLists.size(); i++) { Properties msgProp = getMsgProp(); - if(page.getList().get(i).getDnsStrategyId()!=null && page.getList().get(i).getDnsStrategyId()!=0){ - List resStrategys=dnsResStrategyService.findDnsResStrategys(page.getList().get(i).getDnsStrategyId(), 1,1); + if(ipLists.get(i).getDnsStrategyId()!=null && ipLists.get(i).getDnsStrategyId()!=0){ + List resStrategys=dnsResStrategyService.findDnsResStrategys(ipLists.get(i).getDnsStrategyId(), 1,1); if(resStrategys!=null && resStrategys.size()>0){ String msg= msgProp.getProperty(resStrategys.get(0).getCfgDesc()); if(!StringUtil.isEmpty(msg)){ - page.getList().get(i).setDnsStrategyName(msg); + ipLists.get(i).setDnsStrategyName(msg); }else{ - page.getList().get(i).setDnsStrategyName(resStrategys.get(0).getCfgDesc()); + ipLists.get(i).setDnsStrategyName(resStrategys.get(0).getCfgDesc()); } }else{ - page.getList().get(i).setDnsStrategyName(msgProp.getProperty("no_strategy")); + ipLists.get(i).setDnsStrategyName(msgProp.getProperty("no_strategy")); } }else{ - page.getList().get(i).setDnsStrategyName(msgProp.getProperty("no_strategy")); + ipLists.get(i).setDnsStrategyName(msgProp.getProperty("no_strategy")); } } titleList.add(entity.getMenuNameCode()); @@ -819,7 +819,7 @@ public class WebsiteController extends BaseController{ List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); List regionInfoList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { CfgIndexInfo cfgIndexInfo=websiteCfgService.exportdns(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); @@ -827,7 +827,7 @@ public class WebsiteController extends BaseController{ } subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList); regionInfoList=ComplexkeywordCfg.replaceComplexKeyList(regionInfoList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); dataMap.put("NTC_IP", ipList); dataMap.put("NTC_DNS_REGION", regionInfoList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); @@ -854,18 +854,18 @@ public class WebsiteController extends BaseController{ List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); - /*//导出选中记录 - if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = websiteCfgService.getWebsiteList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = websiteCfgService.getWebsiteList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_SSL_SNI"); @@ -903,7 +903,7 @@ public class WebsiteController extends BaseController{ List sslCnList = new ArrayList<>(); List ipPortList = new ArrayList<>(); List subscribeIdList = new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=websiteCfgService.exportssl(cfg); sslSniList.addAll(maps.get("NTC_SSL_SNI")); sslSnaList.addAll(maps.get("NTC_SSL_SAN")); @@ -915,7 +915,7 @@ public class WebsiteController extends BaseController{ sslSnaList=BaseStringCfg.replaceBaseKeyList(sslSnaList); sslCnList=BaseStringCfg.replaceBaseKeyList(sslCnList); subscribeIdList=BaseStringCfg.baseHexList(subscribeIdList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_UNIVERSAL_IP", ipPortList); dataMap.put("NTC_SSL_SNI", sslSniList); dataMap.put("NTC_SSL_SAN", sslSnaList); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index c493fe3a4..1794ef977 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -343,20 +343,18 @@ public class WhiteListController extends CommonController{ Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipCfgService.getIpCfgList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.getIpCfgList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); @@ -369,11 +367,11 @@ public class WhiteListController extends CommonController{ noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); noExportMap.put("NTC_IP", ipPortInfoNoExport); List ipList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg :ipLists) { CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); } - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); @@ -394,20 +392,19 @@ public class WhiteListController extends CommonController{ Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = domainService.getDomainList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = domainService.getDomainList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); titleList.add("NTC_HTTP_URL"); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); @@ -420,12 +417,12 @@ public class WhiteListController extends CommonController{ noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); noExportMap.put("NTC_HTTP_URL", httpUrlInfoNoExport); List httpurlList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { CfgIndexInfo cfgIndexInfo=domainService.exportDomainInfo(cfg); httpurlList.addAll(cfgIndexInfo.getHttpUrlList()); } httpurlList=BaseStringCfg.replaceBaseKeyList(httpurlList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_HTTP_URL", httpurlList); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 712cc2d7a..0b722959c 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -292,21 +292,20 @@ public class HttpRedirectPolicyController extends BaseController{ List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); - /*//导出选中记录 - if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - - Page page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity); + Properties prop = getMsgProp(); - for (CfgIndexInfo str : page.getList()) { + for (CfgIndexInfo str :ipLists) { if(entity.getFunctionId()!=210 && entity.getFunctionId()!=211){ String type="RESPONSE_CODE"; if(entity.getFunctionId()==207){ @@ -377,7 +376,7 @@ public class HttpRedirectPolicyController extends BaseController{ List httpResBodyList = new ArrayList<>(); List ipPortList = new ArrayList<>(); List subscribeIdList = new ArrayList<>(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=httpRedirectCfgService.exportHttpCfg(cfg); httpUrlList.addAll(maps.get("NTC_HTTP_URL")); httpReqHdrList.addAll(maps.get("NTC_HTTP_REQ_HDR")); @@ -402,7 +401,7 @@ public class HttpRedirectPolicyController extends BaseController{ noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport); noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_HTTP_URL", httpUrlList); dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList); if(entity.getFunctionId()!=208 && entity.getFunctionId()!=211){ diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 017a44737..0d5f2c96a 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -241,21 +241,18 @@ public class InterceptController extends CommonController{ Map noExportMap=new HashMap(); Map replaceExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=ipCfgService.getByIdsList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipCfgService.getIpCfgList(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.getIpCfgList(pageInfo, entity); - //获取证书信息 List certificateList=new ArrayList(); if(entity.getFunctionId().equals(200)){ @@ -264,7 +261,7 @@ public class InterceptController extends CommonController{ if(entity.getFunctionId().equals(201)){ certificateList=pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "domain"); } - for (CfgIndexInfo str : page.getList()) { + for (CfgIndexInfo str : ipLists) { if(!StringUtil.isEmpty(str.getUserRegion5())){ Properties prop = getMsgProp(); String cs= DictUtils.getDictLabel("INTERCEPT_DOMAIN_INTENSITY", str.getUserRegion5()); @@ -308,7 +305,7 @@ public class InterceptController extends CommonController{ List ipList=new ArrayList(); List httpUrlList=new ArrayList(); List pktBinList=new ArrayList(); - for (CfgIndexInfo cfg : page.getList()) { + for (CfgIndexInfo cfg : ipLists) { Map maps=interceptCfgService.exportIpInfo(cfg); httpUrlList.addAll(maps.get("NTC_HTTP_URL")); ipList.addAll(maps.get("PXY_INTERCEPT_IP")); @@ -316,7 +313,7 @@ public class InterceptController extends CommonController{ } pktBinList=BaseStringCfg.replaceBaseKeyList(pktBinList); httpUrlList=BaseStringCfg.baseHexList(httpUrlList); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); if(entity.getFunctionId()==212){ //IP Payload cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-"; titleList.add("PXY_INTERCEPT_IP"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index f6c952302..341fa4afb 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -39,6 +39,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.google.common.collect.Maps; import com.nis.domain.Page; import com.nis.domain.basics.PolicyGroupInfo; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjKeyring; @@ -410,29 +411,27 @@ public class PxyObjKeyringController extends BaseController { Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=pxyObjKeyringService.findByList(ids); + }else{ + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = pxyObjKeyringService.findPage(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = pxyObjKeyringService.findPage(pageInfo, entity); - for (int i = 0; i > classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - - /*//导出选中记录 - * if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); + List ipLists=new ArrayList(); + //导出选中记录 + if(!StringUtil.isEmpty(ids)){ + ipLists=pxyObjKeyringService.findByCertList(ids); + }else{ + Page pageInfo=new Page(request, response,"r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity); + ipLists=page.getList(); } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{*/ - //条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo=new Page(request, response,"r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity); - for (PxyObjTrustedCaCert cert:page.getList()) { + for (PxyObjTrustedCaCert cert:ipLists) { if(!StringUtil.isEmpty(cert.getCompileId())){ cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId())); } } - model.addAttribute("page", page); titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), PxyObjTrustedCaCert.class); String cfgIndexInfoNoExport=",whether_area_block,block_type,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:cert_name-"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java index 2112edaf7..3257fa471 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java @@ -35,8 +35,11 @@ import com.nis.web.dao.MyBatisDao; */ @MyBatisDao public interface AppCfgDao { - //app策略配置增删改查 public List findAppPolicyList(AppPolicyCfg entity) ; + + + //app策略配置增删改查 + public List findAppByPolicyList(@Param("ids")String ids) ; public AppPolicyCfg getAppPolicyCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId) ; public IpPortCfg getAppPolicyIpCfg(AppPolicyCfg entity) ; public List getAppPolicyIpList(AppPolicyCfg entity); @@ -106,4 +109,17 @@ public interface AppCfgDao { // 导入配置时数据批量入库使用 public void insertAppDomainCfgBatch(AppDomainCfg cfg); public void insertAppHttpCfgBatch(AppHttpCfg cfg); + + //app 主题网站配置查 + public List findAppByTopicDomainList(@Param("ids")String ids) ; + //app协议IP配置查 + public List findAppByIpList(@Param("ids")String ids) ; + //app http特征查 + public List findAppByHttpList(@Param("ids")String ids) ; + + //app 域名配置增删改查 + public List findAppByDomainList(@Param("ids")String ids) ; + + //app ssl证书特征配置CRUD + public List findAppBySslList(@Param("ids")String ids); } 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 5282b852b..89895b804 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -3004,4 +3004,95 @@ ) + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java index a20972d83..34dacf6a7 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java @@ -62,4 +62,6 @@ public interface AppMultiFeatureCfgDao { public List getAppIpRangeCfg(@Param("compileId")Integer compileId,@Param("functionId")Integer functionId) ; public int insertAppIpRangeCfg(AppIpCfg entity); public void deleteAppIpRangeCfg(BaseCfg entity); + + public List findAppByFeatureIndexList(@Param("ids")String ids); } 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 ec1caaf13..e450dcd85 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -521,4 +521,21 @@ delete from app_complex_feature_cfg where compile_id=#{compileId} and function_id=#{functionId} + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.java b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.java index b66e79800..e8349ca49 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.java @@ -13,4 +13,6 @@ import com.nis.web.dao.MyBatisDao; public interface DdosCfgDao extends CrudDao { List findPage(DdosIpCfg cfg); DdosIpCfg getDdosIpCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); + List findByPage(@Param("ids")String ids); + } diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml index 317b5d16e..0d5bd808f 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml @@ -372,4 +372,19 @@ + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java index e0b0fa891..24a80313b 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java @@ -14,4 +14,5 @@ public interface DnsIpCfgDao extends CrudDao { DnsIpCfg getDnsIpCfg(Long cfgId); List findDnsIpCfg(DnsIpCfg entity); List getValidCfgInfo(DnsIpCfg cfg); + List findByPage(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index 6cb35f3af..9b7429421 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -377,4 +377,21 @@ + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.java b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.java index 4987aee67..184b63f28 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.java +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.java @@ -18,4 +18,6 @@ public interface DnsResStrategyDao extends CrudDao { ,@Param("isAudit")Integer isAudit ,@Param("isValid")Integer isValid); + List findByPage(@Param("ids")String ids); + } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index e9d200688..8627c300e 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -368,4 +368,21 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java index a85073fa8..84a69dc31 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java @@ -46,5 +46,7 @@ public interface IpCfgDao extends CrudDao{ public void updateCfgValid(BaseCfg entity); public void auditCfg(BaseCfg entity); public List getIpCfgList(CfgIndexInfo entity); + + public List getByIdsList(@Param("ids")String ids); } 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 1334d6e6a..fbcda475f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -1143,4 +1143,20 @@ + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.java b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.java index ac6108ef3..8736baaab 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.java +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.java @@ -13,6 +13,10 @@ import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface PxyObjKeyringDao extends CrudDao{ List findPage( PxyObjKeyring pxyObjKeyring); + + List findByList(@Param("ids")String ids); + List findByCertList(@Param("ids")String ids); + List findTrustedCertPage( PxyObjTrustedCaCert PxyObjTrustedCaCert); List findList(@Param("cfgId")Long cfgId ,@Param("isAudit")Integer isAudit diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index 0f5f40661..2971e2990 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -797,4 +797,38 @@ + + + + + + + + \ No newline at end of file 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 ceeaeca87..543ddaee9 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -30,6 +30,7 @@ import com.nis.domain.configuration.AppTopicDomainCfg; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; @@ -94,6 +95,12 @@ public class AppCfgService extends BaseService { return page; } + public List findAppByPolicyList(String ids) { + List list = appCfgDao.findAppByPolicyList(ids); + return list; + } + + public Page findAppIpList(Page page, AppIpCfg entity) { entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.setPage(page); @@ -101,6 +108,11 @@ public class AppCfgService extends BaseService { page.setList(list); return page; } + + public List findAppByIpList(String ids) { + List list = appCfgDao.findAppByIpList(ids); + return list; + } public Page findAppHttpList(Page page, AppHttpCfg entity) { entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); @@ -109,6 +121,11 @@ public class AppCfgService extends BaseService { page.setList(list); return page; } + + public List findAppByHttpList(String ids ) { + List list = appCfgDao.findAppByHttpList(ids); + return list; + } public Page findAppDomainList(Page page, AppDomainCfg entity) { entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); @@ -118,6 +135,11 @@ public class AppCfgService extends BaseService { return page; } + public List findAppByDomainList(String ids) { + List list = appCfgDao.findAppByDomainList(ids); + return list; + } + public AppPolicyCfg exportIpInfo(AppPolicyCfg policy){ List ipPortList = appCfgDao.getAppPolicyIpList(policy); policy.setIpPortList(ipPortList); @@ -136,6 +158,14 @@ public class AppCfgService extends BaseService { page.setList(list); return page; } + + // 主题网站列表 + public List findAppByTopicDomainList(String ids) { + List list = appCfgDao.findAppByTopicDomainList(ids); + return list; + } + + public Page findAppByteList(Page page, AppByteCfg entity) { entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); @@ -152,6 +182,11 @@ public class AppCfgService extends BaseService { page.setList(list); return page; } + + public List findAppBySslList(String ids) { + List list = appCfgDao.findAppBySslList(ids); + return list; + } public Page findAppTcpList(Page page, AppTcpCfg entity) { entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); 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 f474bde23..6af93124f 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -60,6 +60,14 @@ public class AppMultiFeatureCfgService extends BaseService { page.setList(list); return page; } + + //分页查询 + public List findAppByFeatureIndexList(String ids) { + List list = appMultiFeatureCfgDao.findAppByFeatureIndexList(ids); + return list; + } + + public AppFeatureIndex getAppFeatureIndex(Long cfgId) { return appMultiFeatureCfgDao.getAppFeatureIndex(cfgId); } diff --git a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java index ac538f437..d5945afe8 100644 --- a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java @@ -62,6 +62,11 @@ public class DdosCfgService extends BaseService{ return page; } + public List findByPage(String ids) { + List list=ddosCfgDao.findByPage(ids); + return list; + } + public DdosIpCfg getDdosIpCfg(Long cfgId,Integer compileId) { return ddosCfgDao.getDdosIpCfg(cfgId,compileId); } diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java index 1355b1401..a30727730 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -48,6 +48,11 @@ public class DnsIpCfgService extends BaseService{ return page; } + public List findByPage(String ids) { + List list=dnsIpCfgDao.findByPage(ids); + return list; + } + public List findDnsIpCfg(DnsIpCfg entity) { return dnsIpCfgDao.findDnsIpCfg(entity); } diff --git a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java index b3a002feb..42756bfa0 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java @@ -52,6 +52,13 @@ public class DnsResStrategyService extends BaseService{ page.setList(list); return page; } + + public List findByPage(String ids ) { + List list=dnsResStrategyDao.findByPage(ids); + return list; + } + + public List findDnsResStrategys(Long cfgId,Integer isValid,Integer isAudit) { List list=dnsResStrategyDao.findList(cfgId,isValid,isAudit); return list; 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 ab964ad43..c7d65241d 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -932,4 +932,9 @@ public class IpCfgService extends CrudService { return page; } + public List getByIdsList(String ids) { + List list = ipCfgDao.getByIdsList(ids); + return list; + } + } diff --git a/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java b/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java index 97ce21885..6f99c3755 100644 --- a/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java +++ b/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java @@ -56,6 +56,17 @@ public class PxyObjKeyringService extends BaseService{ page.setList(list); return page; } + public List findByList(String ids) { + List list=pxyObjKeyringDao.findByList(ids); + return list; + } + + public List findByCertList(String ids) { + List list=pxyObjKeyringDao.findByCertList(ids); + return list; + } + + /** * 查询分页数据 * @param page 分页对象