diff --git a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java index 446203897..1ae4d318c 100644 --- a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java @@ -12,11 +12,11 @@ public class AvFileSampleCfg extends BaseCfg { private String indexTable="av_file_sample_cfg"; @Expose @SerializedName("srcFile") - @ExcelField(title="src_file",sort=2) + @ExcelField(title="src_file",sort=3) private String srcUrl; @Expose @SerializedName("dstFile") - @ExcelField(title="sample_file",sort=3) + @ExcelField(title="sample_file",sort=4) private String sampleUrl; @Expose @SerializedName("srcFileMd5") diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index 8be421416..57fef7b6d 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -29,13 +29,13 @@ public class FileDigestCfg extends BaseCfg { private static final long serialVersionUID = 2796500715438264119L; private static final String tableName="file_digest_cfg"; private String indexTable="file_digest_cfg"; - @ExcelField(title="raw_len",sort=3) + @ExcelField(title="raw_len",sort=4) private Long rawLen; - @ExcelField(title="digest",sort=2) + @ExcelField(title="digest",sort=3) private String digest; - @ExcelField(title="cfds_level",sort=4) + @ExcelField(title="harm_level",sort=5) private Integer cfdsLevel; - @ExcelField(title="file_url",sort=5) + @ExcelField(title="file_url",sort=6) private String fileUrl; private NtcSubscribeIdCfg ntcSubscribeIdCfg; diff --git a/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java b/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java index f8cdda62c..f8e854c0f 100644 --- a/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java @@ -3,6 +3,7 @@ package com.nis.domain.configuration; import java.util.List; import com.google.gson.annotations.SerializedName; +import com.nis.util.excel.ExcelField; /** * IP复用地址池实体 @@ -13,15 +14,16 @@ public class IpAddrPoolCfg extends BaseCfg{ private static final long serialVersionUID = 1392197458744667669L; private String indexTable="ip_reuse_addr_pool"; - + @ExcelField(title="address_pool",sort=2) private String addrPoolName; // 地址池名称 + @ExcelField(title="ip_total",sort=3) private Integer ipTotal; // IP总数 private Integer availableIpTotal; // 可用IP总数 private String description; // 描述信息 private List ipCfgs; // 地址池IP信息 - @SerializedName("cfgId") + @ExcelField(title="address_pool_id",sort=0) private Integer compileId; public String getIndexTable() { diff --git a/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java index 47803a4f8..124bb0bd8 100644 --- a/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java @@ -3,6 +3,7 @@ package com.nis.domain.configuration; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.Constants; +import com.nis.util.excel.ExcelField; /** * IP复用DNAT策略实体 @@ -16,6 +17,7 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{ @Expose @SerializedName("configId") + @ExcelField(title="cfg_id",sort=0) private Integer compileId; @Expose @@ -24,22 +26,26 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{ @Expose @SerializedName("originalDestIp") + @ExcelField(title="original_dest_ip",sort=4) private String srcIpAddress; @Expose @SerializedName("originalDestPort") + @ExcelField(title="original_dest_port",sort=5) private String srcPort; - @Expose @SerializedName("originalProtocol") + @ExcelField(title="protocol",dictType="PROTOCOL",sort=8) private Integer protocol; @Expose @SerializedName("translatedDestIp") + @ExcelField(title="translated_dest_ip",sort=6) private String destIpAddress; @Expose @SerializedName("translatedDestPort") + @ExcelField(title="translated_dest_port",sort=7) private String destPort; @Expose diff --git a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java index 573bb6f00..af29f5ca5 100644 --- a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java @@ -3,6 +3,7 @@ package com.nis.domain.configuration; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.Constants; +import com.nis.util.excel.ExcelField; /** * IP复用策略 @@ -20,6 +21,7 @@ public class IpReusePolicyCfg extends BaseCfg{ private Integer userId; // 用户标识 @Expose + @ExcelField(title="user_type",dictType="USER_TYPE",sort=4) protected String userType; // 用户类型 @Expose protected Integer addrPoolId; // 地址池ID @@ -27,11 +29,14 @@ public class IpReusePolicyCfg extends BaseCfg{ protected String translateParam; // 地址翻译参数 @Expose @SerializedName("userId") + @ExcelField(title="user",sort=5) private String userName; + @ExcelField(title="address_pool",sort=3) private String addrPoolName; // 仅用于列表条件检索 private Integer ipType; private Integer ipPattern; + @ExcelField(title="ip",sort=6) private String srcIpAddress; private String destIpAddress; @Expose diff --git a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java index 6094f6f2c..7c712c3b8 100644 --- a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java +++ b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java @@ -1,7 +1,5 @@ package com.nis.domain.configuration; -import java.util.Date; - import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; @@ -23,10 +21,13 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{ private String port; @Expose @SerializedName("addrType") + @ExcelField(title="ip_type",dictType="IP_TYPE",sort=4) private Integer ipType; @Expose @SerializedName("ip") + @ExcelField(title="IP",sort=5) private String ipAddress; + @ExcelField(title="group",sort=3) private String groupName;//欺骗IP池（IP组）名称 @Expose @SerializedName("policyGroup") @@ -36,6 +37,7 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{ private Integer location;//位置，无意义，固定为0 @Expose @SerializedName("cfgId") + @ExcelField(title="cfg_id",sort=0) private Integer compileId; @Expose @SerializedName("userRegion") diff --git a/src/main/java/com/nis/domain/configuration/UserManage.java b/src/main/java/com/nis/domain/configuration/UserManage.java index da0163f70..5ce08c73e 100644 --- a/src/main/java/com/nis/domain/configuration/UserManage.java +++ b/src/main/java/com/nis/domain/configuration/UserManage.java @@ -3,25 +3,33 @@ package com.nis.domain.configuration; import java.util.Date; import com.nis.domain.BaseEntity; +import com.nis.util.excel.ExcelField; public class UserManage extends BaseEntity{ private static final long serialVersionUID = -2749633756272829982L; private static final String tableName="user_manage"; + @ExcelField(title="user_name",sort=1) private String userName; private String userPwd; + @ExcelField(title="vpn_ip",sort=2) private String serverIp; private String authMethod; private Integer numLogins; private String lastLogin; private String transferBytes; private String transferPackets; + private Long creatorId; + @ExcelField(title="config_time",sort=5) private Date createTime; + private Long editorId; + @ExcelField(title="edit_time",sort=7) private Date editTime; private Integer isValid; + @ExcelField(title="desc",sort=3) private String remarks; private String userType; @@ -39,8 +47,9 @@ public class UserManage extends BaseEntity{ private String incomingBroadcastPackets; private String incomingBroadcastTotalSize; private Integer numberOfLogins;*/ - + @ExcelField(title="creator",sort=4) private String creatorName; + @ExcelField(title="editor",sort=6) private String editorName; private Date search_create_time_start; private Date search_create_time_end; diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 0b96126c7..766c0d7b0 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -130,6 +130,9 @@ public class ExcelCsv { Map> commentMap=new HashMap>(); for (String title : titleList) { String noExportField=noExportMap.get(title); + if(noExportField.contains("do_log")){ + noExportField=",do_blacklist,"+noExportField; + } List annotationList = Lists.newArrayList(); List list=new ArrayList(); // Get annotation field diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index fe63edeb2..098c7ad77 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -33,6 +33,7 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.RegionUtil; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFRichTextString; @@ -2132,6 +2133,9 @@ public class ExportExcel { Map> commentMap=new HashMap>(); for (String title : titleList) { String noExportField=noExportMap.get(title); + if(noExportField.contains("do_log")){ + noExportField=",do_blacklist,"+noExportField; + } List annotationList = Lists.newArrayList(); List list=new ArrayList(); // Get annotation field @@ -2293,11 +2297,10 @@ public class ExportExcel { Row timeRow = sheet.createRow(0); timeRow.setHeightInPoints(16); Cell cellt = timeRow.createCell(0); - cellt.setCellStyle(style); cellt.setCellValue(titleTime); sheet.addMergedRegion(callRangeAddress); sheet.autoSizeColumn(0); - //-------------------- + setBorderStyle(CellStyle.BORDER_THIN,callRangeAddress,sheet,wb); } Integer rownum=rownums.get(title); Row headerRow = sheet.createRow(rownum++); @@ -2326,6 +2329,21 @@ public class ExportExcel { log.debug("Initialize success."); } + + public void setBorderStyle(int border, CellRangeAddress region, Sheet sheet, SXSSFWorkbook wb){ + RegionUtil.setBorderBottom(border, region, sheet, wb);//下边框 + RegionUtil.setBorderLeft(border, region, sheet, wb); //左边框 + RegionUtil.setBorderRight(border, region, sheet, wb); //右边框 + RegionUtil.setBorderTop(border, region, sheet, wb); //上边框 + RegionUtil.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + RegionUtil.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + RegionUtil.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + RegionUtil.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + } + + + + /** * 输出数据流 * @param os 输出数据流 diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index de827a5e8..cbe2ca96c 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2071,30 +2071,25 @@ public class BaseController { titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start()); if(cfg.getSearch_create_time_end()!=null){ titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); - } - }else{ - if(cfg.getSearch_create_time_end()!=null){ - titleTime+=" "+msgProp.getProperty("config_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); + } } if(cfg.getSearch_edit_time_start()!=null){ titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start()); if(cfg.getSearch_edit_time_end()!=null){ titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); - } - }else{ - if(cfg.getSearch_edit_time_end()!=null){ - titleTime+=" "+msgProp.getProperty("edit_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); } } if(cfg.getSearch_audit_time_start()!=null){ titleTime+=" "+msgProp.getProperty("audit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_audit_time_start()); if(cfg.getSearch_audit_time_end()!=null){ titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_audit_time_end()); - } - }else{ - if(cfg.getSearch_audit_time_end()!=null){ - titleTime+=" "+msgProp.getProperty("audit_time")+"： —"+DateUtils.formatDateTime(cfg.getSearch_audit_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); } } return titleTime; diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java index 25569c76e..564c499ac 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java @@ -1,7 +1,6 @@ package com.nis.web.controller.configuration.maintenance; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -21,7 +20,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.IpReuseIpCfg; -import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.IpAddrPoolCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; @@ -224,5 +222,67 @@ public class IpAddrPoolController extends BaseController{ List ipList = ipReuseIpCfgService.getPolicyIpInfo(addrPoolId); return ipList; } + + + @RequestMapping(value = "exportIpPool") + public void exportIpPool(Model model, HttpServletRequest request, HttpServletResponse response, + @ModelAttribute("cfg") IpAddrPoolCfg 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(); + + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = ipAddrPoolCfgService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipAddrPoolCfgService.findPage(pageInfo, entity); + ipLists = page.getList(); + } + for (IpAddrPoolCfg ipAddrPoolCfg : ipLists) { + Integer compId=ipAddrPoolCfg.getCfgId().intValue(); + ipAddrPoolCfg.setCompileId(compId); + } + + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), IpAddrPoolCfg.class); + String cfgIndexInfoNoExport = ",cfg_id,config_describe,block_type,policy_name,do_log,,whether_area_block,do_blacklist,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + // 时间过滤 + if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null && entity.getSearch_edit_time_end() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) { + cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; + } + if (!StringUtil.isEmpty(entity.gethColumns())) { + cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; + } + + noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), ipLists); + + String timeRange = initTimeMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(entity.getExType())) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("ip white export failed", e); + addMessage(redirectAttributes, "error", "export_failed"); + } + } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index 7359c6dbf..56302cafb 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -23,9 +23,14 @@ import com.google.common.collect.Maps; import com.nis.domain.Page; import com.nis.domain.basics.IpReuseIpCfg; import com.nis.domain.basics.ServiceDictInfo; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.UserManage; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; +import com.nis.util.DateUtils; import com.nis.util.StringUtil; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; @@ -352,4 +357,87 @@ public class UserManageController extends BaseController{ model.addAttribute("user", user); return "/cfg/maintenance/userManage/userView"; }*/ + // 配置导出 + @RequestMapping(value = "exportUser") + public void exportbgp(Model model, HttpServletRequest request, HttpServletResponse response,String hColumns,String exType, + @ModelAttribute("cfg") UserManage 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(); + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = userManageService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = userManageService.findPage(pageInfo, entity); + ipLists = page.getList(); + } + titleList.add("user_manage"); + classMap.put("user_manage", UserManage.class); + String cfgIndexInfoNoExport = ","; + // 时间过滤 + if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null && entity.getSearch_edit_time_end() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + + if (!StringUtil.isEmpty(hColumns)) { + cfgIndexInfoNoExport = "," + hColumns + "," + cfgIndexInfoNoExport; + } + for (UserManage userManage : ipLists) { + if(!StringUtils.isEmpty( userManage.getServerIp())){ + userManage.setServerIp(userManage.getServerIp().substring(0,userManage.getServerIp().length()-1).replaceAll(",", "，")); + } + } + noExportMap.put("user_manage", cfgIndexInfoNoExport); + dataMap.put("user_manage", ipLists); + String timeRange = initUserMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(exType)) { + this._exportCsv(model, request, response, redirectAttributes, "user_manage", titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, "user_manage", titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("user export failed", e); + addMessage(redirectAttributes, "error", "export_failed"); + } + // return "redirect:" + adminPath + // +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + public String initUserMap(UserManage cfg){ + Properties msgProp = getMsgProp(); + String titleTime=msgProp.getProperty("user_manage","user_manage"); + if(cfg.getSearch_create_time_start()!=null){ + titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start()); + if(cfg.getSearch_create_time_end()!=null){ + titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); + } + }else{ + if(cfg.getSearch_create_time_end()!=null){ + titleTime+=" "+msgProp.getProperty("config_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); + } + } + if(cfg.getSearch_edit_time_start()!=null){ + titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start()); + if(cfg.getSearch_edit_time_end()!=null){ + titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); + } + }else{ + if(cfg.getSearch_edit_time_end()!=null){ + titleTime+=" "+msgProp.getProperty("edit_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); + } + } + return titleTime; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index b5c54efea..df8f9a255 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -31,6 +31,7 @@ import com.nis.domain.Page; import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpAddrPoolCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpReuseDnatPolicyCfg; @@ -430,7 +431,7 @@ public class IpMultiplexController extends CommonController { // snat配置导出 @RequestMapping(value = "exportSnat") public void exportSnat(Model model, HttpServletRequest request, HttpServletResponse response, - @ModelAttribute("cfg") BaseIpCfg entity, String ids, RedirectAttributes redirectAttributes) { + @ModelAttribute("cfg") IpReusePolicyCfg entity, String ids, RedirectAttributes redirectAttributes) { try { // export data info List titleList = new ArrayList(); @@ -438,27 +439,38 @@ public class IpMultiplexController extends CommonController { Map dataMap = new HashMap(); Map noExportMap = new HashMap(); Properties msgProp = getMsgProp(); - - /* - * //导出选中记录 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, "r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.findPage(pageInfo, entity);// - for (BaseIpCfg baseIp : page.getList()) { - if (StringUtil.isEmpty(baseIp.getGroupName())) { - baseIp.setGroupName(msgProp.getProperty("default_group")); + // 导出选中记录 + List ipLists = new ArrayList(); + + if (!StringUtil.isEmpty(ids)) { + ipLists = ipMultiplexService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipMultiplexService.findPage(pageInfo,entity); + ipLists = page.getList(); + } + List addrPools = ipAddrPoolCfgService.getEffectiveAddrPool(); + for (IpReusePolicyCfg ipReusePolicyCfg : ipLists) { + if(ipReusePolicyCfg.getAddrPoolId()!=null){ + for (IpAddrPoolCfg addr : addrPools) { + if(ipReusePolicyCfg.getAddrPoolId()==addr.getCfgId().intValue()){ + ipReusePolicyCfg.setAddrPoolName(addr.getAddrPoolName()); + } + } + } + if(ipReusePolicyCfg.getUserType().equals("VPN")){ + ipReusePolicyCfg.setUserType(msgProp.getProperty("policy_vpn_user","VPN")); + }else if(ipReusePolicyCfg.getUserType().equals("SIPv4")){ + ipReusePolicyCfg.setUserType(msgProp.getProperty("policy_sipv4_user","SIPv4")); + }else if(ipReusePolicyCfg.getUserType().equals("SIPv6")){ + ipReusePolicyCfg.setUserType(msgProp.getProperty("policy_sipv6_user","SIPv6")); } } titleList.add(entity.getMenuNameCode()); - classMap.put(entity.getMenuNameCode(), BaseIpCfg.class); - String snatNoExport = ",client_ip,group_name,server_ip,ip_type,ip_pattern,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; + classMap.put(entity.getMenuNameCode(), IpReusePolicyCfg.class); + String snatNoExport = ",block_type,client_ip,group_name,server_ip,ip_type,ip_pattern,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -475,7 +487,7 @@ public class IpMultiplexController extends CommonController { } noExportMap.put(entity.getMenuNameCode(), snatNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); @@ -497,7 +509,7 @@ public class IpMultiplexController extends CommonController { // dnat配置导出 @RequestMapping(value = "exportDnat") public void exportDnat(Model model, HttpServletRequest request, HttpServletResponse response, - @ModelAttribute("cfg") BaseIpCfg entity, String ids, RedirectAttributes redirectAttributes) { + @ModelAttribute("cfg") IpReuseDnatPolicyCfg entity, String ids, RedirectAttributes redirectAttributes) { try { // export data info List titleList = new ArrayList(); @@ -505,27 +517,21 @@ public class IpMultiplexController extends CommonController { Map dataMap = new HashMap(); Map noExportMap = new HashMap(); Properties msgProp = getMsgProp(); - - /* - * //导出选中记录 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, "r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.findPage(pageInfo, entity);// - for (BaseIpCfg baseIp : page.getList()) { - if (StringUtil.isEmpty(baseIp.getGroupName())) { - baseIp.setGroupName(msgProp.getProperty("default_group")); - } + // 导出选中记录 + List ipLists = new ArrayList(); + if (!StringUtil.isEmpty(ids)) { + ipLists = ipMultiplexService.findPageByDnat(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipMultiplexService.findPageDnat(pageInfo, entity); + ipLists = page.getList(); } + titleList.add(entity.getMenuNameCode()); - classMap.put(entity.getMenuNameCode(), BaseIpCfg.class); - String snatNoExport = ",direction,client_ip,ip_type,ip_pattern,port_pattern,client_port,ir_type,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; + classMap.put(entity.getMenuNameCode(), IpReuseDnatPolicyCfg.class); + String snatNoExport = ",group_name,block_type,direction,client_ip,ip_type,ip_pattern,port_pattern,client_port,ir_type,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -542,7 +548,7 @@ public class IpMultiplexController extends CommonController { } noExportMap.put(entity.getMenuNameCode(), snatNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 126b59d4e..32baf47df 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -43,6 +43,7 @@ import com.nis.domain.configuration.AvSignSampleCfg; import com.nis.domain.configuration.AvSignSampleCfgModel; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.maat.ToMaatResult; @@ -585,18 +586,20 @@ public class AvController 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{ - */ + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = avCfgService.getAvFileBySampleList(ids); + } else { + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo = new Page(request, response, "a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = avCfgService.getAvFileSampleList(pageInfo, entity); + ipLists = page.getList(); + } // 条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo = new Page(request, response, "a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = avCfgService.getAvFileSampleList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class); String cfgIndexInfoNoExport = ",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; @@ -616,7 +619,7 @@ public class AvController extends BaseController { } noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); 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 ff536414c..98d141c71 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 @@ -826,23 +826,22 @@ public class FileTransferCfgController 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()); - Page pageInfo = new Page(request, response, "a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = fileTransferCfgService.getFileDigestList(pageInfo, entity); + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = fileTransferCfgService.getFileByDigestList(ids); + } else { + Page pageInfo = new Page(request, response, "a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = fileTransferCfgService.getFileDigestList(pageInfo, entity); + ipLists = page.getList(); + } + titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), FileDigestCfg.class); String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; - + // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; @@ -858,7 +857,7 @@ public class FileTransferCfgController extends BaseController { } noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /* } */ String timeRange = initTimeMap(entity); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java index 081957466..1587ce73e 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.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.PxyObjSpoofingIpPool; @@ -198,4 +199,66 @@ public class PxyObjSpoofingIpPoolController extends BaseController { return "redirect:" + adminPath +"/proxy/spoofing/pool/list?functionId="+functionId; } + + // ip配置导出 + @RequestMapping(value = "exportIpPool") + public void exportIpAddr(Model model, HttpServletRequest request, HttpServletResponse response, + @ModelAttribute("cfg") PxyObjSpoofingIpPool 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(); + + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = pxyObjSpoofingIpPoolService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = pxyObjSpoofingIpPoolService.findPage(pageInfo, entity); + ipLists = page.getList(); + } + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), PxyObjSpoofingIpPool.class); + String cfgIndexInfoNoExport = ",policy_name,do_log,ir_type,whether_area_block,do_blacklist,block_type,ip_pattern,client_ip,server_ip,port_pattern,client_port,server_port,direction,protocol,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + + // 时间过滤 + if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null && entity.getSearch_edit_time_end() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) { + cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; + } + if (!StringUtil.isEmpty(entity.gethColumns())) { + cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; + } + + noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), ipLists); + /* } */ + String timeRange = initTimeMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(entity.getExType())) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("ip white export failed", e); + addMessage(redirectAttributes, "error", "export_failed"); + } + // return "redirect:" + adminPath + // +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + + } diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java index cb4593bc3..ff82c26ff 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java @@ -23,4 +23,6 @@ public interface AvCfgDao { public void updateAvSignSampleValid(AvSignSampleCfg entity); public void auditAvFileSample(AvFileSampleCfg entity); public void auditAvSignSample(AvSignSampleCfg entity); + + public List getAvFileBySampleList(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index eccc12071..d85f7485a 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -560,4 +560,20 @@ where cfg_id = #{cfgId,jdbcType=BIGINT} + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java index fc3bbb240..21c1378f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java @@ -57,5 +57,6 @@ public interface FileTransferCfgDao extends CrudDao { public void deleteP2pHashCfg(CfgIndexInfo entity); public void deleteP2pKeywordCfg(CfgIndexInfo entity); public void deleteP2pSubscribeIdCfg(CfgIndexInfo entity); + public List getFileByDigestList(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index ee96246fa..ade978ed2 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -1267,4 +1267,20 @@ where cfg_id = #{cfgId,jdbcType=BIGINT} + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java index a31492f26..91236942f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java @@ -36,6 +36,8 @@ public interface IpAddrPoolCfgDao extends CrudDao{ Long getAddrPoolIdByName(String addrPoolName); IpReuseIpCfg checkAddrPoolIp(@Param("srcIpAddress")String ip); + + List findByPage(@Param("ids")String ids); diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml index 859c119db..cb00eec6e 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml @@ -489,4 +489,28 @@ r.is_audit != 3 AND r.user_region1 IS NOT NULL + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java index 549e736c9..5bd15336f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java @@ -44,4 +44,8 @@ public interface IpMultiplexDao extends CrudDao{ IpReusePolicyCfg getSnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); IpReuseDnatPolicyCfg getDnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); + + List findByPage(@Param("ids")String ids); + + List findPageByDnat(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index 603256054..83cf57b38 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -739,4 +739,50 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java index b36b2cab5..75ffe3093 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java @@ -18,4 +18,6 @@ public interface PxyObjSpoofingIpPoolDao extends CrudDao{ PxyObjSpoofingIpPool getPxyObjSpoofingIpPool(Long cfgId); int insert(PxyObjSpoofingIpPool spoofingPool); int update(PxyObjSpoofingIpPool spoofingPool); + + List findByPage(@Param("ids")String ids); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml index 5fb39f261..1d5556e77 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml @@ -289,4 +289,23 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/UserManageDao.java b/src/main/java/com/nis/web/dao/configuration/UserManageDao.java index 11f5c2d50..b92e4363f 100644 --- a/src/main/java/com/nis/web/dao/configuration/UserManageDao.java +++ b/src/main/java/com/nis/web/dao/configuration/UserManageDao.java @@ -15,6 +15,6 @@ public interface UserManageDao extends CrudDao{ UserManage getUserByLoginName(@Param("userName") String userName); List findList(UserManage entity); UserManage getUserById(@Param("id") String id); - + List findByList(@Param("ids")String ids); List findUsers(); } diff --git a/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml b/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml index 0cfecdd2f..dcf81652f 100644 --- a/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml @@ -157,4 +157,16 @@ from user_manage a where a.is_valid !=-1 + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index bf93033f5..49994ac48 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -66,6 +66,12 @@ public class AvCfgService extends BaseService{ page.setList(list); return page; } + + public List getAvFileBySampleList(String ids){ + List list = avCfgDao.getAvFileBySampleList(ids); + return list; + } + public Page getAvSignSampleList(Page page, AvSignSampleCfg entity){ // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index b571e16ea..6a7fcf8f9 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -401,6 +401,15 @@ public class FileTransferCfgService extends CrudService getFileByDigestList(String ids){ + List list = fileTransferCfgDao.getFileByDigestList(ids); + return list; + } + + + + + public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){ FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId); List subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity); diff --git a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java index eadb57e4c..93db450f4 100644 --- a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java @@ -54,6 +54,11 @@ public class IpAddrPoolCfgService extends BaseService{ return page; } + public List findByPage(String ids) { + List list=ipAddrPoolCfgDao.findByPage(ids); + return list; + } + /** * 获取数据跳转表单 * @param id diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index a6de5c52a..4e7f2f8d3 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -43,6 +43,11 @@ public class IpMultiplexService extends BaseService{ page.setList(list); return page; } + + public List findByPage(String ids) { + List list=ipMultiplexDao.findByPage(ids); + return list; + } public IpReusePolicyCfg getPolicyCfg(Long cfgId, Integer isValid) { List list=ipMultiplexDao.findList(cfgId,isValid); @@ -284,6 +289,12 @@ public class IpMultiplexService extends BaseService{ page.setList(list); return page; } + + public List findPageByDnat(String ids) { + List list=ipMultiplexDao.findPageByDnat(ids); + return list; + } + public IpReuseDnatPolicyCfg getDnatPolicyCfg(Long cfgId, Integer isValid) { List list=ipMultiplexDao.findDnatList(cfgId,isValid); diff --git a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java index b7b8630e6..c1261877b 100644 --- a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java +++ b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java @@ -73,6 +73,11 @@ public class PxyObjSpoofingIpPoolService extends BaseService{ return page; } + public List findByPage(String ids) { + List list=pxyObjSpoofingIpPoolDao.findByPage(ids); + return list; + } + public List findPxyObjSpoofingIpPools(PxyObjSpoofingIpPool entity) { List list=pxyObjSpoofingIpPoolDao.findList(entity); @@ -212,7 +217,7 @@ public class PxyObjSpoofingIpPoolService extends BaseService{ if(!ispList.contains(ispCode)){ ispList.add(ispCode); } - map.replace(areaCode, ispList); + //map.replace(areaCode, ispList); } }else { // 区域 diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java index 296ef4a81..a2c3c96d0 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -47,6 +47,13 @@ public class UserManageService extends BaseService{ page.setList(list); return page; } + + public List findByPage(String ids ) { + List list=userManageDao.findByList(ids); + return list; + } + + public UserManage getUserByLoginName(String userName) { return userManageDao.getUserByLoginName(userName); } diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 07b1ff26e..0794ba3f4 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -26,27 +26,27 @@ - + - + - + - + - + @@ -400,7 +400,7 @@ function cancelPassOpt(url){ return flag; } //导出 - function exportData(url,maxRow,searchUrl){ + function exportData(url,maxRow,searchUrl,exType){ var column=[]; var hColumn=[]; //隐藏列名 $("#${id} ${value} thead tr th").each(function(){ @@ -428,7 +428,7 @@ function cancelPassOpt(url){ //导出检索条件下所有数据 }else{ var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); - if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) { + if (exType!='log') { if(totalCount > maxRow){ top.$.jBox.confirm(""+maxRow+"!","",function(v,h,f){ if(v=="ok"){ @@ -453,12 +453,5 @@ function cancelPassOpt(url){ } } - function confirmEnding(str, target) { - var result=true; - var num=str.indexOf(target); - if (-1==num) { - result=false; - } - return result; - } + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index fa79e79f5..541d00564 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -137,8 +137,19 @@ -<%-- - --%> + + +
+ +
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+ href="javascript:;"> @@ -227,13 +239,13 @@ - - - - - - - + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp index 72e7f5154..8a4f7dd8f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp @@ -139,6 +139,18 @@ <%-- --%> + +
+ +
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+