From 09a0c49f934aa216de5255c0a4bc6b17aa3fe8ec Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 22 Oct 2018 14:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E6=9B=BF=E6=8D=A2=E4=B8=8B=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 2 ++ .../configuration/proxy/InterceptController.java | 4 ++++ .../web/service/configuration/InterceptCfgService.java | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 0d768a9af..da3bfbcff 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2904,6 +2904,8 @@ public class BaseController { String fileName = msgProp.getProperty(functionName, functionName) + "_" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + + fileName=fileName.replaceAll(" ", "_"); if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) { fileName = URLEncoder.encode(fileName, "UTF-8"); } else { 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 dd7df0bf4..8afb41a11 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 @@ -239,8 +239,12 @@ public class InterceptController extends CommonController{ List interInfoList=new ArrayList(); for (CfgIndexInfo cfg : page.getList()) { CfgIndexInfo cfgIndexInfo=interceptCfgService.exportIpInfo(cfg); + if(cfgIndexInfo.getIpPortList()!=null){ ipList.addAll(cfgIndexInfo.getIpPortList()); + } + if(cfgIndexInfo.getInterceptPktBinList()!=null){ interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList()); + } } interInfoList=BaseStringCfg.replaceBaseKeyList(interInfoList); dataMap.put(entity.getMenuNameCode(), page.getList()); diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index d9f69bd51..3d5df15c1 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -76,10 +76,14 @@ public class InterceptCfgService extends CrudService public CfgIndexInfo exportIpInfo(CfgIndexInfo entity){ List ipPortList = websiteCfgDao.getIpPortList(entity); - entity.setIpPortList(ipPortList); - if(StringUtils.isNotBlank(entity.getUserRegion1())) { + if(ipPortList!=null){ + entity.setIpPortList(ipPortList); + } + if(entity.getFunctionId()!=null) { List info=interceptCfgDao.getInterceptPktBin(entity); + if(info!=null){ entity.setInterceptPktBinList(info); + } } return entity; }