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

修复检索条件查询后，导出数据不对应

Browse Source
This commit is contained in:
leijun
2018-11-07 16:16:57 +08:00
parent 8b4648a5e6
commit b4fb93b38a
56 changed files with 373 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -902,7 +902,7 @@ public class AvContentController extends BaseController {
//stream配置导出
@RequestMapping(value = "exportStream")
public void exportsteam(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportStream(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -922,13 +922,8 @@ public class AvContentController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}
@@ -992,7 +987,7 @@ public class AvContentController extends BaseController {
//voip配置导出
@RequestMapping(value = "exportVoip")
public void exportvoip(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportVoip(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -1012,13 +1007,8 @@ public class AvContentController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}

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

@@ -469,7 +469,7 @@ public class AvController extends BaseController {
//ysp配置导出
@RequestMapping(value = "exportYsp")
public void exportysp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportYsp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AvFileSampleCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -489,13 +489,8 @@ public class AvController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AvFileSampleCfg> pageInfo=new Page<AvFileSampleCfg>(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);
}
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);

13
src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
View File

@@ -157,7 +157,7 @@ public class BgpCfgController extends BaseController{
//bgp配置导出
@RequestMapping(value = "exportbgp")
public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportbgp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -177,13 +177,8 @@ public class BgpCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = bgpCfgService.getBgpList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP");
@@ -229,7 +224,7 @@ public class BgpCfgController extends BaseController{
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("dns export failed",e);
logger.error("bgp export failed",e);
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -478,7 +478,7 @@ public class FileTransferCfgController extends BaseController{
//ftp配置导出
@RequestMapping(value = "exportftp")
public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportftp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -498,13 +498,8 @@ public class FileTransferCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = fileTransferCfgService.getFtpList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP");
@@ -566,7 +561,7 @@ public class FileTransferCfgController extends BaseController{
//p2p配置导出
@RequestMapping(value = "exportP2p")
public void exportp2p(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportP2p(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -586,13 +581,8 @@ public class FileTransferCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = fileTransferCfgService.getP2pList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
@@ -660,7 +650,7 @@ public class FileTransferCfgController extends BaseController{
//file配置导出
@RequestMapping(value = "exportFile")
public void exportfile(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportFile(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")FileDigestCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -680,13 +670,8 @@ public class FileTransferCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<FileDigestCfg> pageInfo=new Page<FileDigestCfg>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), FileDigestCfg.class);

11
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -360,7 +360,7 @@ public class IpController extends BaseController{
}
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -380,13 +380,8 @@ public class IpController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP");

11
src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
View File

@@ -190,7 +190,7 @@ public class MailCfgController extends BaseController{
//mail配置导出
@RequestMapping(value = "exportmail")
public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportmail(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -210,13 +210,8 @@ public class MailCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = mailCfgService.getMailList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";

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

@@ -557,13 +557,8 @@ public class WebsiteController extends BaseController{
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
@@ -685,13 +680,8 @@ public class WebsiteController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(pageInfo, entity);
for (int i = 0; i < page.getList().size(); i++) {
Properties msgProp = getMsgProp();
@@ -763,7 +753,7 @@ public class WebsiteController extends BaseController{
//ssl配置导出
@RequestMapping(value = "exportSsl")
public String exportssl(Model model,HttpServletRequest request,HttpServletResponse response,
public String exportSsl(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -783,13 +773,8 @@ public class WebsiteController extends BaseController{
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP");

25
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -11,15 +11,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.taglibs.standard.functions.Functions;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
@@ -29,7 +25,6 @@ import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.WhiteListIpTemplate;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
@@ -278,7 +273,7 @@ public class WhiteListController extends CommonController{
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -298,13 +293,8 @@ public class WhiteListController extends CommonController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP");
@@ -354,13 +344,8 @@ public class WhiteListController extends CommonController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(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);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = domainService.getDomainList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_HTTP_URL");