gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多媒体、IP复用、增加导出excel和csv

Browse Source
This commit is contained in:
leijun
2018-12-23 00:36:58 +08:00
parent 9080960e95
commit df32c39736
42 changed files with 730 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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;

64
src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
View File

@@ -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<IpReuseIpCfg> 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<String> titleList = new ArrayList<String>();
Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
List<IpAddrPoolCfg> ipLists = new ArrayList<IpAddrPoolCfg>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = ipAddrPoolCfgService.findByPage(ids);
} else {
Page<IpAddrPoolCfg> pageInfo = new Page<IpAddrPoolCfg>(request, response, "r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<IpAddrPoolCfg> 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");
}
}
}

88
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -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<String> titleList = new ArrayList<String>();
Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
List<UserManage> ipLists = new ArrayList<UserManage>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = userManageService.findByPage(ids);
} else {
Page<UserManage> pageInfo = new Page<UserManage>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<UserManage> 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;
}
}

88
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -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<String> titleList = new ArrayList<String>();
@@ -438,27 +439,38 @@ public class IpMultiplexController extends CommonController {
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
Properties msgProp = getMsgProp();
/*
* //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String
* id:ids.split(",")){ Long.parseLong(id); } //List<CfgIndexInfo>
* list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename()
* , entity.getFunctionId(), ids); }else{
*/
// 条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> pageInfo = new Page<BaseIpCfg>(request, response, "r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<BaseIpCfg> page = ipCfgService.findPage(pageInfo, entity);//
for (BaseIpCfg baseIp : page.getList()) {
if (StringUtil.isEmpty(baseIp.getGroupName())) {
baseIp.setGroupName(msgProp.getProperty("default_group"));
// 导出选中记录
List<IpReusePolicyCfg> ipLists = new ArrayList<IpReusePolicyCfg>();
if (!StringUtil.isEmpty(ids)) {
ipLists = ipMultiplexService.findByPage(ids);
} else {
Page<IpReusePolicyCfg> pageInfo = new Page<IpReusePolicyCfg>(request, response, "r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<IpReusePolicyCfg> page = ipMultiplexService.findPage(pageInfo,entity);
ipLists = page.getList();
}
List<IpAddrPoolCfg> 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<String> titleList = new ArrayList<String>();
@@ -505,27 +517,21 @@ public class IpMultiplexController extends CommonController {
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
Properties msgProp = getMsgProp();
/*
* //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String
* id:ids.split(",")){ Long.parseLong(id); } //List<CfgIndexInfo>
* list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename()
* , entity.getFunctionId(), ids); }else{
*/
// 条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> pageInfo = new Page<BaseIpCfg>(request, response, "r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<BaseIpCfg> page = ipCfgService.findPage(pageInfo, entity);//
for (BaseIpCfg baseIp : page.getList()) {
if (StringUtil.isEmpty(baseIp.getGroupName())) {
baseIp.setGroupName(msgProp.getProperty("default_group"));
}
// 导出选中记录
List<BaseIpCfg> ipLists = new ArrayList<BaseIpCfg>();
if (!StringUtil.isEmpty(ids)) {
ipLists = ipMultiplexService.findPageByDnat(ids);
} else {
Page<BaseIpCfg> pageInfo = new Page<BaseIpCfg>(request, response, "r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<BaseIpCfg> 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);

27
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -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<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
/*
* //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String
* id:ids.split(",")){ Long.parseLong(id); } //List<CfgIndexInfo>
* list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename()
* , entity.getFunctionId(), ids); }else{
*/
List<AvFileSampleCfg> ipLists = new ArrayList<AvFileSampleCfg>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = avCfgService.getAvFileBySampleList(ids);
} else {
entity.setTableName(IpPortCfg.getTablename());
Page<AvFileSampleCfg> pageInfo = new Page<AvFileSampleCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity);
ipLists = page.getList();
}
// 条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AvFileSampleCfg> pageInfo = new Page<AvFileSampleCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AvFileSampleCfg> 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);

29
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -826,23 +826,22 @@ public class FileTransferCfgController extends BaseController {
Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
/*
* //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String
* id:ids.split(",")){ Long.parseLong(id); } //List<CfgIndexInfo>
* list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename()
* , entity.getFunctionId(), ids); }else{
*/
// 条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<FileDigestCfg> pageInfo = new Page<FileDigestCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(pageInfo, entity);
List<FileDigestCfg> ipLists = new ArrayList<FileDigestCfg>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = fileTransferCfgService.getFileByDigestList(ids);
} else {
Page<FileDigestCfg> pageInfo = new Page<FileDigestCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<FileDigestCfg> 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);

63
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java
View File

@@ -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<String> titleList = new ArrayList<String>();
Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
List<PxyObjSpoofingIpPool> ipLists = new ArrayList<PxyObjSpoofingIpPool>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = pxyObjSpoofingIpPoolService.findByPage(ids);
} else {
Page<PxyObjSpoofingIpPool> pageInfo = new Page<PxyObjSpoofingIpPool>(request, response, "r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<PxyObjSpoofingIpPool> 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();
}
}

2
src/main/java/com/nis/web/dao/configuration/AvCfgDao.java
View File

@@ -23,4 +23,6 @@ public interface AvCfgDao {
public void updateAvSignSampleValid(AvSignSampleCfg entity);
public void auditAvFileSample(AvFileSampleCfg entity);
public void auditAvSignSample(AvSignSampleCfg entity);
public List<AvFileSampleCfg> getAvFileBySampleList(@Param("ids")String ids);
}

16
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -560,4 +560,20 @@
where cfg_id = #{cfgId,jdbcType=BIGINT}
</update>
<select id="getAvFileBySampleList" resultMap="AvFileSampleMap" >
SELECT
<include refid="AvFileSample_Column" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName
</trim>
FROM av_file_sample_cfg a
left join sys_user s on a.creator_id=s.id
left join sys_user e on a.editor_id=e.id
left join sys_user u on a.auditor_id=u.id
left join request_info ri on a.request_id=ri.id
where a.CFG_ID in (${ids})
</select>
</mapper>

1
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java
View File

@@ -57,5 +57,6 @@ public interface FileTransferCfgDao extends CrudDao<CfgIndexInfo> {
public void deleteP2pHashCfg(CfgIndexInfo entity);
public void deleteP2pKeywordCfg(CfgIndexInfo entity);
public void deleteP2pSubscribeIdCfg(CfgIndexInfo entity);
public List<FileDigestCfg> getFileByDigestList(@Param("ids")String ids);
}

16
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -1267,4 +1267,20 @@
</set>
where cfg_id = #{cfgId,jdbcType=BIGINT}
</update>
<select id="getFileByDigestList" resultMap="digestCfgMap" parameterType="com.nis.domain.configuration.FileDigestCfg" >
SELECT
<include refid="DigestCfg_Column" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName
</trim>
FROM file_digest_cfg a
left join sys_user s on a.creator_id=s.id
left join sys_user e on a.editor_id=e.id
left join sys_user u on a.auditor_id=u.id
left join request_info ri on a.request_id=ri.id
where a.CFG_ID in (${ids})
</select>
</mapper>

2
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java
View File

@@ -36,6 +36,8 @@ public interface IpAddrPoolCfgDao extends CrudDao<IpAddrPoolCfgDao>{
Long getAddrPoolIdByName(String addrPoolName);
IpReuseIpCfg checkAddrPoolIp(@Param("srcIpAddress")String ip);
List<IpAddrPoolCfg> findByPage(@Param("ids")String ids);

24
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -489,4 +489,28 @@
r.is_audit != 3 AND
r.user_region1 IS NOT NULL
</select>
<select id="findByPage" resultMap="addrPoolMap">
SELECT
<include refid="addrPoolColumns"/>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,
e.name as editor_name,
u.name as auditor_name,
ri.request_title as requestName
</trim>
FROM
ip_reuse_addr_pool r
left join
sys_user s on r.creator_id = s.id
left join
sys_user e on r.editor_id = e.id
left join
sys_user u on r.auditor_id = u.id
left join
request_info ri on r.request_id = ri.id
where r.CFG_ID in (${ids})
</select>
</mapper>

4
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java
View File

@@ -44,4 +44,8 @@ public interface IpMultiplexDao extends CrudDao<IpMultiplexDao>{
IpReusePolicyCfg getSnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId);
IpReuseDnatPolicyCfg getDnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId);
List<IpReusePolicyCfg> findByPage(@Param("ids")String ids);
List<BaseIpCfg> findPageByDnat(@Param("ids")String ids);
}

46
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -739,4 +739,50 @@
</if>
</where>
</select>
<select id="findByPage" resultMap="policyMap">
SELECT
<include refid="policyColumns"/>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,
e.name as editor_name,
u.name as auditor_name,
ri.request_title as requestName
</trim>
FROM
ip_reuse_policy_cfg r
left join
sys_user s on r.creator_id = s.id
left join
sys_user e on r.editor_id = e.id
left join
sys_user u on r.auditor_id = u.id
left join
request_info ri on r.request_id = ri.id
where a.CFG_ID in (${ids})
</select>
<select id="findPageByDnat" resultMap="dnatPolicyMap">
SELECT
<include refid="dnatPolicyColumns"/>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,
e.name as editor_name,
u.name as auditor_name,
ri.request_title as requestName
</trim>
FROM
ip_reuse_dnat_policy a
left join
sys_user s on a.creator_id = s.id
left join
sys_user e on a.editor_id = e.id
left join
sys_user u on a.auditor_id = u.id
left join
request_info ri on a.request_id = ri.id
where a.CFG_ID in (${ids})
</select>
</mapper>

2
src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java
View File

@@ -18,4 +18,6 @@ public interface PxyObjSpoofingIpPoolDao extends CrudDao<PxyObjSpoofingIpPool>{
PxyObjSpoofingIpPool getPxyObjSpoofingIpPool(Long cfgId);
int insert(PxyObjSpoofingIpPool spoofingPool);
int update(PxyObjSpoofingIpPool spoofingPool);
List<PxyObjSpoofingIpPool> findByPage(@Param("ids")String ids);
}

19
src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml
View File

@@ -289,4 +289,23 @@
</if>
</where>
</update>
<!-- 查出所有 有效数据-->
<select id="findByPage" resultMap="PxyObjSpoofingPoolMap">
SELECT
<include refid="PxyObjSpoofingIpPoolColumns"/>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName,p.group_name as group_name
</trim>
FROM pxy_obj_spoofing_ip_pool r
left join policy_group_info p on p.group_id=r.group_id
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
left join sys_user u on r.auditor_id=u.id
left join request_info ri on r.request_id=ri.id
where r.CFG_ID in (${ids})
</select>
</mapper>

2
src/main/java/com/nis/web/dao/configuration/UserManageDao.java
View File

@@ -15,6 +15,6 @@ public interface UserManageDao extends CrudDao<UserManage>{
UserManage getUserByLoginName(@Param("userName") String userName);
List<UserManage> findList(UserManage entity);
UserManage getUserById(@Param("id") String id);
List<UserManage> findByList(@Param("ids")String ids);
List<UserManage> findUsers();
}

12
src/main/java/com/nis/web/dao/configuration/UserManageDao.xml
View File

@@ -157,4 +157,16 @@
<include refid="Columns"/>
from user_manage a where a.is_valid !=-1
</select>
<select id="findByList" parameterType="com.nis.domain.configuration.UserManage" resultMap="userManageMap">
SELECT
<include refid="Columns"/>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name ,e.name as editor_name
</trim>
FROM user_manage a
left join sys_user s on a.creator_id=s.id
left join sys_user e on a.editor_id=e.id
where a.CFG_ID in (${ids})
</select>
</mapper>

6
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -66,6 +66,12 @@ public class AvCfgService extends BaseService{
page.setList(list);
return page;
}
public List<AvFileSampleCfg> getAvFileBySampleList(String ids){
List<AvFileSampleCfg> list = avCfgDao.getAvFileBySampleList(ids);
return list;
}
public Page<AvSignSampleCfg> getAvSignSampleList(Page<AvSignSampleCfg> page, AvSignSampleCfg entity){
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));

9
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -401,6 +401,15 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
return page;
}
public List<FileDigestCfg> getFileByDigestList(String ids){
List<FileDigestCfg> list = fileTransferCfgDao.getFileByDigestList(ids);
return list;
}
public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
List<NtcSubscribeIdCfg> subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity);

5
src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java
View File

@@ -54,6 +54,11 @@ public class IpAddrPoolCfgService extends BaseService{
return page;
}
public List<IpAddrPoolCfg> findByPage(String ids) {
List<IpAddrPoolCfg> list=ipAddrPoolCfgDao.findByPage(ids);
return list;
}
/**
* 获取数据跳转表单
* @param id

11
src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
View File

@@ -43,6 +43,11 @@ public class IpMultiplexService extends BaseService{
page.setList(list);
return page;
}
public List<IpReusePolicyCfg> findByPage(String ids) {
List<IpReusePolicyCfg> list=ipMultiplexDao.findByPage(ids);
return list;
}
public IpReusePolicyCfg getPolicyCfg(Long cfgId, Integer isValid) {
List<IpReusePolicyCfg> list=ipMultiplexDao.findList(cfgId,isValid);
@@ -284,6 +289,12 @@ public class IpMultiplexService extends BaseService{
page.setList(list);
return page;
}
public List<BaseIpCfg> findPageByDnat(String ids) {
List<BaseIpCfg> list=ipMultiplexDao.findPageByDnat(ids);
return list;
}
public IpReuseDnatPolicyCfg getDnatPolicyCfg(Long cfgId, Integer isValid) {
List<IpReuseDnatPolicyCfg> list=ipMultiplexDao.findDnatList(cfgId,isValid);

7
src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java
View File

@@ -73,6 +73,11 @@ public class PxyObjSpoofingIpPoolService extends BaseService{
return page;
}
public List<PxyObjSpoofingIpPool> findByPage(String ids) {
List<PxyObjSpoofingIpPool> list=pxyObjSpoofingIpPoolDao.findByPage(ids);
return list;
}
public List<PxyObjSpoofingIpPool> findPxyObjSpoofingIpPools(PxyObjSpoofingIpPool entity) {
List<PxyObjSpoofingIpPool> 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 {
// 区域

7
src/main/java/com/nis/web/service/configuration/UserManageService.java
View File

@@ -47,6 +47,13 @@ public class UserManageService extends BaseService{
page.setList(list);
return page;
}
public List<UserManage> findByPage(String ids ) {
List<UserManage> list=userManageDao.findByList(ids);
return list;
}
public UserManage getUserByLoginName(String userName) {
return userManageDao.getUserByLoginName(userName);
}