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

摘要置信度修改同样例，下发时为level=level/10

Browse Source 
导出文件名中空格处理
This commit is contained in:
duandongmei
2018-10-22 13:41:59 +08:00
parent 3ceddad1c8
commit 03a1991612
6 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -1731,6 +1731,11 @@ public class ExportExcel {
public ExportExcel write(HttpServletResponse response, String fileName) throws IOException{
response.reset();
response.setContentType("application/octet-stream; charset=utf-8");
if(!StringUtil.isEmpty(fileName)){
fileName=fileName.replace(" ", "_");
}else{
fileName="export.xlsx";
}
response.setHeader("Content-Disposition", "attachment; filename=\""+fileName+"\"");
write(response.getOutputStream());
return this;
@@ -1751,6 +1756,12 @@ public class ExportExcel {
*/
public ExportExcel write(HttpServletRequest request,HttpServletResponse response, String fileName) throws IOException{
if(!StringUtil.isEmpty(fileName)){
fileName=fileName.replace(" ", "_");
}else{
fileName="export.xlsx";
}
final String userAgent = request.getHeader("USER-AGENT");
String finalFileName = null;
if(StringUtils.contains(userAgent, "MSIE")){//IE浏览器

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

@@ -234,11 +234,11 @@ public class IpController extends BaseController{
,FunctionServiceDict serviceDict
,Integer requestId) throws Exception{
Properties pro=getMsgProp();
String serviceName=pro.getProperty(serviceDict.getServiceName());
//String serviceName=pro.getProperty(serviceDict.getServiceName());
String regionName=pro.getProperty(regionDict.getConfigRegionValue());
serviceName=StringUtil.isEmpty(serviceName) ?serviceDict.getServiceName():serviceName;
//serviceName=StringUtil.isEmpty(serviceName) ?serviceDict.getServiceName():serviceName;
regionName=StringUtil.isEmpty(regionName) ?regionDict.getConfigRegionValue():regionName;
String fileName = serviceName+"_"+regionName+"_template.xlsx";
String fileName = regionName+"_Template.xlsx";
//ip类模板
if(regionDict.getRegionType().equals(1)){
if(regionDict.getFunctionId().equals(5)){// IP Address

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

@@ -582,6 +582,13 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList");
if(!StringUtil.isEmpty(digestRegionList)){
for (DigestCfg digest : digestRegionList) {
if(!StringUtil.isEmpty(digest.getCfdsLevel()) && (digest.getCfdsLevel() > 1)){
digest.setCfdsLevel((int)(digest.getCfdsLevel()/10));
}
}
}
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}