摘要置信度修改同样例，下发时为level=level/10
导出文件名中空格处理
This commit is contained in:
duandongmei
@@ -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浏览器
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
|
||||
@@ -411,7 +411,7 @@ logo_file_type=,bmp,jpg,tiff,raw,gif,
|
||||
#logo File Size 10M 10485760\uff08single\uff09
|
||||
logo_single_file_max_size=10485760
|
||||
#voip File Types
|
||||
voip_file_type=,mp3,mp4,flv,ivf,mp2v,jpg,
|
||||
voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
|
||||
#voip File Size 10M 10485760\uff08single\uff09
|
||||
voip_single_file_max_size=0
|
||||
|
||||
@@ -505,7 +505,7 @@ ipv4_default_ip_value=0.0.0.0
|
||||
ipv6_default_ip_value=\:\:
|
||||
ipv4_default_ip_subnet_value=0.0.0.0/16
|
||||
ipv6_default_ip_subnet_value=::/128
|
||||
ipv4_default_ip_range_value=0.0.0.0-0.0.0.0
|
||||
ipv4_default_ip_range_value=192.168.10.1-2
|
||||
ipv6_default_ip_range_value=::-::
|
||||
#\u7aef\u53e3\u9ed8\u8ba4\u503c
|
||||
port_default=0
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
$("#file").on('change', function() {
|
||||
$("#fileInfo").val($("#file").val());
|
||||
});
|
||||
hiddenlevel();
|
||||
$(".action").on("change", function() {
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
$("#protocolId").val($(this).attr("protocolId"));
|
||||
hiddenlevel();
|
||||
});
|
||||
$("#serviceId").val($(".action:checked").attr("serviceId"));
|
||||
$("#protocolId").val($(".action:checked").attr("protocolId"));
|
||||
@@ -92,6 +94,20 @@
|
||||
$("." + contentClassName).addClass("hidden").addClass("disabled");
|
||||
$("." + addBtnClassName).removeClass("hidden");
|
||||
}
|
||||
function hiddenlevel(){
|
||||
var action=$("input[name='action']:checked").val();
|
||||
if(action==16){
|
||||
$(".leveL").addClass("hidden");
|
||||
$("select[name='cfdsLevel']").find("option").eq(0).attr("value","1");
|
||||
$("select[name='cfdsLevel']").val("1");
|
||||
$("select[name='cfdsLevel']").selectpicker("refresh");
|
||||
}else {
|
||||
$(".leveL").removeClass("hidden");
|
||||
$("select[name='cfdsLevel']").find("option").eq(0).attr("value","");
|
||||
$("select[name='cfdsLevel']").val("90");
|
||||
$("select[name='cfdsLevel']").selectpicker("refresh");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
@@ -205,17 +221,20 @@
|
||||
<div for="fileInfo"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font
|
||||
color="red">*</font> <spring:message code="cfds_level" /></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required digits" type="text"
|
||||
range="[1,10]" name="cfdsLevel" value="${_cfg.cfdsLevel}">
|
||||
</div>
|
||||
<div for="cfdsLevel"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 leveL" >
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="cfdsLevel" data-live-search="true" class="selectpicker form-control required">
|
||||
<option value="0" ><spring:message code="selected"/></option>
|
||||
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
|
||||
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.cfdsLevel==configdenceC.itemCode || (_cfg.cfdsLevel==null && configdenceC.itemCode eq 90)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
<div for="cfdsLevel"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
@@ -325,7 +325,7 @@
|
||||
<th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
|
||||
<th><spring:message code="digest"/></th>
|
||||
<th><spring:message code="raw_len"/></th>
|
||||
<th><spring:message code="cfds_level"/></th>
|
||||
<th><spring:message code="harm_level"/></th>
|
||||
<th><spring:message code="file_url"/></th>
|
||||
<th class="sort-column a.action"><spring:message code="block_type"/></th>
|
||||
<th><spring:message code="whether_area_block"/></th>
|
||||
|
||||
Reference in New Issue
Block a user