diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index 3392e6db0..42dec5ee5 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -163,13 +163,8 @@ public class AsnIpController extends BaseController{ //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = asnIpCfgService.findPage(pageInfo, entity); for (AsnIpCfg asnIp : page.getList()) { asnIp.setIsIssued(String.valueOf(asnIp.getIsValid())); diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 3c172e48c..081e602c4 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1427,7 +1427,7 @@ public class AppCfgController 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")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -1445,13 +1445,8 @@ public class AppCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = appCfgService.findAppPolicyList(pageInfo, entity); for(AppPolicyCfg policy:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId()); @@ -1522,7 +1517,7 @@ public class AppCfgController extends BaseController { //top @RequestMapping(value = "exportTop") - public void exporttop(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportTop(Model model,HttpServletRequest request,HttpServletResponse response, @ModelAttribute("cfg")AppTopicDomainCfg entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -1540,13 +1535,8 @@ public class AppCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = appCfgService.findAppTopicDomainList(pageInfo, entity); for (int i = 0; i < page.getList().size(); i++) { AppTopicDomainCfg appTop=page.getList().get(i); @@ -1569,7 +1559,7 @@ public class AppCfgController extends BaseController { //appIp配置导出 @RequestMapping(value = "exportAppIp") - public void exportAppip(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportAppIp(Model model,HttpServletRequest request,HttpServletResponse response, @ModelAttribute("cfg")AppIpCfg entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -1589,13 +1579,8 @@ public class AppCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = appCfgService.findAppIpList(pageInfo, entity); for(AppIpCfg appIp:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(appIp.getSpecServiceId()); @@ -1637,13 +1622,8 @@ public class AppCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = appCfgService.findAppHttpList(pageInfo, entity); for(AppHttpCfg http:page.getList()){ http.setIsHex(http.getIsHexbin()); @@ -1689,13 +1669,8 @@ public class AppCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = appCfgService.findAppDomainList(pageInfo, entity); for(AppDomainCfg domain:page.getList()){ domain.setIsHex(domain.getIsHexbin()); @@ -1712,7 +1687,7 @@ public class AppCfgController extends BaseController { /*}*/ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { - logger.error("http export failed",e); + logger.error("Domain export failed",e); addMessage(redirectAttributes, "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); @@ -1740,13 +1715,8 @@ public class AppCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = appCfgService.findAppSslList(pageInfo, entity); for(AppSslCertCfg ssl:page.getList()){ ssl.setIsHex(ssl.getIsHexbin()); diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index 8250de8e6..2ecfa9d09 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -260,7 +260,7 @@ public class AppFeatureCfgController extends BaseController { //appfeature配置导出 @RequestMapping(value = "exportFeature") - public void exportAppSsl(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportFeature(Model model,HttpServletRequest request,HttpServletResponse response, @ModelAttribute("cfg")AppFeatureIndex entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -280,13 +280,8 @@ public class AppFeatureCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = appMultiFeatureCfgService.findAppFeatureIndexList(pageInfo, entity); for(AppFeatureIndex feature:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId()); diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index 9286700d4..7f697f60d 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -217,7 +217,7 @@ public class BasicProtocolController 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")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -235,13 +235,8 @@ public class BasicProtocolController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = appCfgService.findAppPolicyList(pageInfo, entity); for(AppPolicyCfg policy:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId()); diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index 832c43f86..5e8244cb8 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -234,7 +234,7 @@ public class EncryptedTunnelBehaviorController 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")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -252,13 +252,8 @@ public class EncryptedTunnelBehaviorController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = appCfgService.findAppPolicyList(pageInfo, entity); for(AppPolicyCfg policy:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId()); diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index ef23f1d93..01d8f9502 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -147,13 +147,8 @@ public class DnsIpCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = dnsIpCfgService.findPage(pageInfo, entity); for (int i = 0; i < page.getList().size(); i++) { if(StringUtil.isEmpty(page.getList().get(i).getDnsStrategyName())){ diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 1f553dcce..a2a22e7b6 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -169,13 +169,8 @@ public class DnsResStrategyController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = dnsResStrategyService.findPage(pageInfo, entity); for (int i = 0; i < page.getList().size(); i++) { page.getList().get(i).setMiTtlmax(String.valueOf(page.getList().get(i).getMinTtl())+"-"+String.valueOf(page.getList().get(i).getMaxTtl())); diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index ae9dfde2b..6838eb8a7 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -285,13 +285,8 @@ public class IpMultiplexPoolCfgController extends BaseController { }else{*/ //条件导出数据大于最大导出数,只导出最大导出条数 Page pageInfo=new Page(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); Page page = ipMultiplexPoolCfgService.findPage(pageInfo, entity); page.setList(ipMultiplexPoolCfgService.getIsp(page.getList())); titleList.add(entity.getMenuNameCode()); @@ -329,13 +324,8 @@ public class IpMultiplexPoolCfgController extends BaseController { }else{*/ //条件导出数据大于最大导出数,只导出最大导出条数 Page pageInfo=new Page(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); Page page = ipMultiplexPoolCfgService.findPage(pageInfo, entity); titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), IpMultiplexPoolCfg.class); diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index 14812314e..6678f646a 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -129,13 +129,8 @@ public class DdosCfgController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = ddosCfgService.findPage(pageInfo, entity); titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DdosIpCfg.class); 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 75ea61b6e..e2e716c0d 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 @@ -223,13 +223,8 @@ public class IpMultiplexController extends CommonController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = ipCfgService.findPage(pageInfo, entity);// for (BaseIpCfg baseIp : page.getList()) { if(StringUtil.isEmpty(baseIp.getGroupName())){ @@ -274,13 +269,8 @@ public class IpMultiplexController extends CommonController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = ipCfgService.findPage(pageInfo, entity);// for (BaseIpCfg baseIp : page.getList()) { if(StringUtil.isEmpty(baseIp.getGroupName())){ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index e109880ee..40fef4f2c 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -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 pageInfo=new Page(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 pageInfo=new Page(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()); } 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 294fa1a23..beac38fef 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 @@ -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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + 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); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 560ca1d91..c06815d58 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page 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(); 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 ab376ae46..30d8314f9 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 @@ -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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page 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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page 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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = fileTransferCfgService.getFileDigestList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), FileDigestCfg.class); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index c19845cb3..6bdf47795 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = ipCfgService.getIpCfgList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index 486e46bb8..cd49074fe 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = mailCfgService.getMailList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 41ac544d5..2564380c5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -557,13 +557,8 @@ public class WebsiteController extends BaseController{ }else{*/ //条件导出数据大于最大导出数,只导出最大导出条数 Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity); String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" @@ -685,13 +680,8 @@ public class WebsiteController extends BaseController{ //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page 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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = websiteCfgService.getWebsiteList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index 142d4d677..e6088fd43 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page 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 pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = domainService.getDomainList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_HTTP_URL"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index b593b0214..849b1f44c 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -271,13 +271,8 @@ public class HttpRedirectPolicyController extends BaseController{ }else{*/ //条件导出数据大于最大导出数,只导出最大导出条数 Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity); Properties prop = getMsgProp(); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 135f17687..94cf2b122 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -196,7 +196,7 @@ public class InterceptController 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 @@ -217,13 +217,8 @@ public class InterceptController extends CommonController{ //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = ipCfgService.getIpCfgList(pageInfo, entity); //获取证书信息 diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 68c0405d8..b64aca31e 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -347,7 +347,7 @@ public class PxyObjKeyringController extends BaseController { //pxyObjKeyring配置导出 @RequestMapping(value = "exportPxy") - public void exportDns(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportPxy(Model model,HttpServletRequest request,HttpServletResponse response, @ModelAttribute("cfg")PxyObjKeyring entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -367,13 +367,8 @@ public class PxyObjKeyringController extends BaseController { //条件导出数据大于最大导出数,只导出最大导出条数 entity.setTableName(IpPortCfg.getTablename()); Page pageInfo=new Page(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); Page page = pxyObjKeyringService.findPage(pageInfo, entity); for (int i = 0; i - + @@ -364,8 +364,10 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); column.push($(this).text().trim()); } }); - if($("#intype").val() != null && $("#intype").val() != ""){ - $("#intype").attr("name",$("#seltype").val()); + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#exportValue").val() != null && $("#exportValue").val() != ""){ + url+="&"+$("#exportType").val()+"="+$("#exportValue").val(); + } } if(column){ url+="&columns="+column.toString(); diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp index 9e4dd3563..8a1b772f1 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp @@ -32,6 +32,12 @@ $("#description").attr("value",''); $("#searchForm")[0].reset(); }); + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); var edit=function(url){ var cked = $('tbody tr td input.i-checks:checkbox:checked'); @@ -84,6 +90,8 @@ + + '); }); + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -85,6 +91,8 @@ + + '); }); + + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -85,6 +92,8 @@ + + '); }); + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } + }); @@ -88,6 +94,8 @@ + + @@ -125,7 +131,11 @@ + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index fefecbd11..5aa05a071 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -87,6 +87,12 @@ $("#"+openId).show(); $("#"+closeId).parent().parent().next("tr").hide(); }); + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -132,6 +138,8 @@ + + '); }); + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -68,6 +74,8 @@ + + "+$("#seltype").find("option:selected").text()); }); + + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -65,6 +72,8 @@ + + @@ -141,6 +148,8 @@ + + + + @@ -135,6 +141,8 @@ + + @@ -127,6 +133,8 @@ + + + + "+$("#seltype").find("option:selected").text()); }); + + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); var edit=function(url){ var cked = $('tbody tr td input.i-checks:checkbox:checked'); @@ -92,6 +99,8 @@ + + @@ -132,6 +138,8 @@ + + @@ -108,6 +114,8 @@ + + @@ -117,6 +123,8 @@ + + @@ -131,6 +137,8 @@ + + @@ -137,6 +143,8 @@ + + "+$("#seltype").find("option:selected").text()); }); + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -58,6 +64,8 @@ + + @@ -127,6 +133,8 @@ + + @@ -130,6 +136,8 @@ + + "+$("#seltype").find("option:selected").text()); }); + + if($("#exportType").val() != null && $("#exportType").val() != ""){ + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#exportValue").val($("#intype").val()); + } + } }); @@ -78,6 +84,8 @@ + + @@ -61,6 +67,8 @@ + + @@ -78,6 +85,8 @@ + + @@ -64,6 +69,8 @@ + + @@ -64,6 +69,8 @@ + + @@ -131,6 +137,8 @@ + + + + @@ -129,6 +135,8 @@ + + + + @@ -128,6 +134,8 @@ + + @@ -109,6 +115,8 @@ + + @@ -126,6 +132,8 @@ + + - +