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-10-22 14:08:22 +08:00
parent 03a1991612
commit 09a0c49f93
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2904,6 +2904,8 @@ public class BaseController {
String fileName = msgProp.getProperty(functionName, functionName) + "_" + DateUtils.getDate("yyyyMMddHHmmss") String fileName = msgProp.getProperty(functionName, functionName) + "_" + DateUtils.getDate("yyyyMMddHHmmss")
+ ".xlsx"; + ".xlsx";
fileName=fileName.replaceAll(" ", "_");
if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) { if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) {
fileName = URLEncoder.encode(fileName, "UTF-8"); fileName = URLEncoder.encode(fileName, "UTF-8");
} else { } else {

4
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -239,8 +239,12 @@ public class InterceptController extends CommonController{
List<BaseStringCfg> interInfoList=new ArrayList<BaseStringCfg>(); List<BaseStringCfg> interInfoList=new ArrayList<BaseStringCfg>();
for (CfgIndexInfo cfg : page.getList()) { for (CfgIndexInfo cfg : page.getList()) {
CfgIndexInfo cfgIndexInfo=interceptCfgService.exportIpInfo(cfg); CfgIndexInfo cfgIndexInfo=interceptCfgService.exportIpInfo(cfg);
if(cfgIndexInfo.getIpPortList()!=null){
ipList.addAll(cfgIndexInfo.getIpPortList()); ipList.addAll(cfgIndexInfo.getIpPortList());
}
if(cfgIndexInfo.getInterceptPktBinList()!=null){
interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList()); interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList());
}
} }
interInfoList=BaseStringCfg.replaceBaseKeyList(interInfoList); interInfoList=BaseStringCfg.replaceBaseKeyList(interInfoList);
dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put(entity.getMenuNameCode(), page.getList());

8
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -76,10 +76,14 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
public CfgIndexInfo exportIpInfo(CfgIndexInfo entity){ public CfgIndexInfo exportIpInfo(CfgIndexInfo entity){
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity); List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
entity.setIpPortList(ipPortList); if(ipPortList!=null){
if(StringUtils.isNotBlank(entity.getUserRegion1())) { entity.setIpPortList(ipPortList);
}
if(entity.getFunctionId()!=null) {
List<InterceptPktBin> info=interceptCfgDao.getInterceptPktBin(entity); List<InterceptPktBin> info=interceptCfgDao.getInterceptPktBin(entity);
if(info!=null){
entity.setInterceptPktBinList(info); entity.setInterceptPktBinList(info);
}
} }
return entity; return entity;
} }