多媒体的置信度默认值bug更改;
音视频的任务调度bug更改; 批量配置生效去掉无效代码
This commit is contained in:
@@ -3137,8 +3137,6 @@ public class BaseController {
|
||||
List<AsnIpCfg> list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList();
|
||||
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
}else {
|
||||
Map<Integer,List> asnIpMap=new HashMap();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
for (AsnIpCfg obj : list) {
|
||||
@@ -3154,7 +3152,6 @@ public class BaseController {
|
||||
}
|
||||
}
|
||||
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData);
|
||||
}
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
@@ -3211,15 +3208,6 @@ public class BaseController {
|
||||
List<AppIpCfg> list=appCfgService.findAppIpList(page, searchAppIpCfg).getList();
|
||||
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
//TODO 批量审核通过APP IP需要处理的问题:一批中存在一个APP 所有IP均未下发过的问题?待解决
|
||||
//先查询所有的asn group,在根据asn group 查询所有未下发的asn ip
|
||||
|
||||
//批量下发时,未下发过的app需要下发正常配置;已下发过的app需要下发ip复用配置(为保证事物,分两种方式下发)
|
||||
/*hasData=configSynchronizationService.auditDdosMaatData(cfgList,userRegionList,
|
||||
page,auditBatchCfg,list,hasData,true);*/
|
||||
|
||||
}else {
|
||||
Map<Integer,List> appIpMap=new HashMap();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
for (AppIpCfg obj : list) {
|
||||
@@ -3235,7 +3223,6 @@ public class BaseController {
|
||||
}
|
||||
}
|
||||
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,appIpMap,hasData);
|
||||
}
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
|
||||
@@ -192,10 +192,10 @@ $(function(){
|
||||
}
|
||||
});
|
||||
|
||||
hiddenlevel();
|
||||
hiddenlevel($("select[name='level']").val());
|
||||
$(".action").on("change",function(){
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
hiddenlevel();
|
||||
hiddenlevel(null);
|
||||
});
|
||||
$("#serviceId").val($(".action:checked").attr("serviceId"));
|
||||
$("#cfgFrom").validate({
|
||||
@@ -242,7 +242,8 @@ $(function(){
|
||||
flag = validateEffectiveRuleLimit("${ctx}",serviceId);
|
||||
}
|
||||
if(flag){
|
||||
$("#cron .detail > div.disabled").remove();//删除disabled 的字段
|
||||
//将disable属性的元素删除
|
||||
$("#cron.disabled").remove();
|
||||
form.submit();
|
||||
}
|
||||
},
|
||||
@@ -269,7 +270,8 @@ function openPicWindow(url){
|
||||
});
|
||||
}
|
||||
|
||||
function hiddenlevel(){
|
||||
function hiddenlevel(level){
|
||||
if(level ==null){
|
||||
var action=$("input[name='action']:checked").val();
|
||||
if(action==16){
|
||||
$(".level").addClass("hidden");
|
||||
@@ -279,10 +281,11 @@ function hiddenlevel(){
|
||||
}else {
|
||||
$(".level").removeClass("hidden");
|
||||
$("select[name='level']").find("option").eq(0).attr("value","");
|
||||
$("select[name='level']").val("100");
|
||||
$("select[name='level']").val("90");
|
||||
$("select[name='level']").selectpicker("refresh");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 校验文件后缀名
|
||||
function sampleFileValidate(fileType,fileName){
|
||||
@@ -487,7 +490,7 @@ function sampleFileValidate(fileType,fileName){
|
||||
<select name="level" 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.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 100)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
|
||||
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 90)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,7 @@ $(function(){
|
||||
if($("#oldAction").val()==1&&$(".action:checked").attr("id")!="actionOff"){
|
||||
$(".level").removeClass("hidden");
|
||||
$(".level").find("select[name='level']").find("option").eq(0).attr("value","");
|
||||
$(".level").find("select[name='level']").val("100");
|
||||
$(".level").find("select[name='level']").val("90");
|
||||
$(".level").find("select[name='level']").selectpicker("refresh");
|
||||
}else{
|
||||
$(".level").addClass("hidden");
|
||||
@@ -38,7 +38,7 @@ $(function(){
|
||||
if($(".action:checked").val()==1){
|
||||
$(".level").removeClass("hidden");
|
||||
$(".level").find("select[name$='level']").find("option").eq(0).attr("value","");
|
||||
$(".level").find("select[name$='level']").val("100");
|
||||
$(".level").find("select[name$='level']").val("90");
|
||||
$(".level").find("select[name$='level']").selectpicker("refresh");
|
||||
}else{
|
||||
$(".level").addClass("hidden");
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
sampleFileValidate();
|
||||
|
||||
});
|
||||
hiddenlevel();
|
||||
hiddenlevel($("select[name='cfdsLevel']").val());
|
||||
$(".action").on("change", function() {
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
$("#protocolId").val($(this).attr("protocolId"));
|
||||
hiddenlevel();
|
||||
hiddenlevel(null);
|
||||
});
|
||||
$("#serviceId").val($(".action:checked").attr("serviceId"));
|
||||
$("#protocolId").val($(".action:checked").attr("protocolId"));
|
||||
@@ -103,7 +103,8 @@
|
||||
$("." + contentClassName).addClass("hidden").addClass("disabled");
|
||||
$("." + addBtnClassName).removeClass("hidden");
|
||||
}
|
||||
function hiddenlevel(){
|
||||
function hiddenlevel(level){
|
||||
if(level ==null){
|
||||
var action=$("input[name='action']:checked").val();
|
||||
if(action==16){
|
||||
$(".leveL").addClass("hidden");
|
||||
@@ -117,6 +118,7 @@
|
||||
$("select[name='cfdsLevel']").selectpicker("refresh");
|
||||
}
|
||||
}
|
||||
}
|
||||
// 校验文件后缀名
|
||||
function sampleFileValidate(){
|
||||
|
||||
|
||||
Reference in New Issue
Block a user