diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index ddba069f6..5b418e669 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -10,6 +10,8 @@ package com.nis.domain.configuration; import java.util.List; +import org.apache.taglibs.standard.functions.Functions; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; @@ -189,5 +191,12 @@ public class BaseStringCfg extends BaseCfg { this.isCaseInsenstive =this.isHexbin;; } + public static List replaceBaseKeyList(List list){ + for (int i = 0; i < list.size(); i++) { + BaseStringCfg base=(BaseStringCfg)list.get(i); + base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); + } + return list; + } } diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index 158a67cb0..ca6097103 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -8,7 +8,10 @@ */ package com.nis.domain.configuration; +import java.util.List; + import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.taglibs.standard.functions.Functions; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -171,4 +174,12 @@ public class ComplexkeywordCfg extends BaseCfg{ this.isHexbin = 0 ; this.matchMethod=3; } + + public static List replaceComplexKeyList(List list){ + for (int i = 0; i < list.size(); i++) { + ComplexkeywordCfg base=(ComplexkeywordCfg)list.get(i); + base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); + } + return list; + } } 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 05814b485..a589969a3 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 @@ -3,7 +3,9 @@ package com.nis.web.controller.configuration.ntc; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,10 +19,12 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcBgpAsCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.exception.MaatConvertException; +import com.nis.util.Constants; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -145,4 +149,83 @@ public class BgpCfgController extends BaseController{ } return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId; } + + //bgp配置导出 + @RequestMapping(value = "exportbgp") + public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + 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()); + Page pageInfo=new Page(request, response,"a"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + Page page = bgpCfgService.getBgpList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); + titleList.add("NTC_IP"); + titleList.add("NTC_DNS_REGION"); + titleList.add("NTC_SUBSCRIBE_ID"); + classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); + classMap.put("NTC_IP", IpPortCfg.class); + classMap.put("NTC_DNS_REGION", ComplexkeywordCfg.class); + classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + String regionCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + noExportMap.put("NTC_IP", ipPortInfoNoExport); + noExportMap.put("NTC_DNS_REGION", regionCfgNoExport); + noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); + List ipList=new ArrayList(); + List subscribeInfoList=new ArrayList(); + List regionInfoList=new ArrayList(); + for (CfgIndexInfo cfg : page.getList()) { + CfgIndexInfo cfgIndexInfo=websiteCfgService.exportdns(cfg); + ipList.addAll(cfgIndexInfo.getIpPortList()); + subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); + regionInfoList.addAll(cfgIndexInfo.getDomainList()); + } + dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put("NTC_IP", ipList); + dataMap.put("NTC_DNS_REGION", regionInfoList); + dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); + + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("dns export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + } 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 a93435eba..68c07ab21 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 @@ -529,8 +529,8 @@ public class FileTransferCfgController extends BaseController{ ipList.addAll(maps.get("NTC_UNIVERSAL_IP")); subscribeInfoList.addAll(maps.get("NTC_SUBSCRIBE_ID")); } - ftpkeyList=replaceList(ftpkeyList); - ftpurlList=replaceList(ftpurlList); + ftpkeyList=BaseStringCfg.replaceBaseKeyList(ftpkeyList); + ftpurlList=BaseStringCfg.replaceBaseKeyList(ftpurlList); dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put("NTC_IP", ipList); dataMap.put("NTC_FTP_URL", ftpurlList); @@ -545,12 +545,5 @@ public class FileTransferCfgController extends BaseController{ //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } - public static List replaceList(List list){ - for (int i = 0; i < list.size(); i++) { - BaseStringCfg base=(BaseStringCfg)list.get(i); - base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); - } - return list; - } } 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 f93ed4e21..36e68d216 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 @@ -341,7 +341,7 @@ public class IpController extends BaseController{ classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); classMap.put("NTC_IP", IpPortCfg.class); classMap.put("asn_policy", ConfigGroupInfo.class); - String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport=",group_name,userregion1,userregion3,userregion4,userregion5,"; String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + ",config_time,editor,edit_time,auditor,audit_time" +",letter,whether_area_block,classification,attribute,label" 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 3bc33ab81..7e9962f82 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 @@ -623,11 +623,11 @@ public class WebsiteController extends BaseController{ ipPortList.addAll(maps.get("NTC_UNIVERSAL_IP")); subscribeIdList.addAll(maps.get("NTC_SUBSCRIBE_ID")); } - httpUrlList=replaceBaseList(httpUrlList); - httpReqHdrList=replaceComplexList(httpReqHdrList); - httpResHdrList=replaceComplexList(httpResHdrList); - httpReqBodyList=replaceBaseList(httpReqBodyList); - httpResBodyList=replaceBaseList(httpResBodyList); + httpUrlList=BaseStringCfg.replaceBaseKeyList(httpUrlList); + httpReqHdrList=ComplexkeywordCfg.replaceComplexKeyList(httpReqHdrList); + httpResHdrList=ComplexkeywordCfg.replaceComplexKeyList(httpResHdrList); + httpReqBodyList=BaseStringCfg.replaceBaseKeyList(httpReqBodyList); + httpResBodyList=BaseStringCfg.replaceBaseKeyList(httpResBodyList); dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put("NTC_HTTP_URL", httpUrlList); dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList); @@ -723,20 +723,5 @@ public class WebsiteController extends BaseController{ } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } - - public static List replaceBaseList(List list){ - for (int i = 0; i < list.size(); i++) { - BaseStringCfg base=(BaseStringCfg)list.get(i); - base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); - } - return list; - } - public static List replaceComplexList(List list){ - for (int i = 0; i < list.size(); i++) { - ComplexkeywordCfg base=(ComplexkeywordCfg)list.get(i); - base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); - } - return list; - } - + } 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 1b81041b4..7d042b5e1 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 @@ -350,17 +350,12 @@ public class WhiteListController extends CommonController{ +",userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); noExportMap.put("NTC_HTTP_URL", httpUrlInfoNoExport); - List httpurlList=new ArrayList(); + List httpurlList=new ArrayList(); for (CfgIndexInfo cfg : page.getList()) { CfgIndexInfo cfgIndexInfo=domainService.exportDomainInfo(cfg); httpurlList.addAll(cfgIndexInfo.getHttpUrlList()); } - if(httpurlList.size()>0){ - for (int i = 0; i < httpurlList.size(); i++) { - BaseStringCfg base=(BaseStringCfg)httpurlList.get(i); - base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); - } - } + httpurlList=BaseStringCfg.replaceBaseKeyList(httpurlList); dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put("NTC_HTTP_URL", httpurlList); /*}*/ 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 ad5b01ce7..dd7df0bf4 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 @@ -242,7 +242,7 @@ public class InterceptController extends CommonController{ ipList.addAll(cfgIndexInfo.getIpPortList()); interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList()); } - interInfoList=replaceBaseList(interInfoList); + interInfoList=BaseStringCfg.replaceBaseKeyList(interInfoList); dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_PKT_BIN", interInfoList); @@ -256,11 +256,4 @@ public class InterceptController extends CommonController{ //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } - public static List replaceBaseList(List list){ - for (int i = 0; i < list.size(); i++) { - BaseStringCfg base=(BaseStringCfg)list.get(i); - base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); - } - return list; - } } diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 24a1af593..acfd575d5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -123,9 +123,7 @@ checked - >