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

多媒体的置信度默认值bug更改；

Browse Source 
音视频的任务调度bug更改；
批量配置生效去掉无效代码
This commit is contained in:
段冬梅
2019-03-19 15:11:34 +08:00
parent f309b8b79b
commit f284491963
4 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3137,24 +3137,21 @@ public class BaseController {
List<AsnIpCfg> list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList(); List<AsnIpCfg> list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList();
if(!StringUtil.isEmpty(list)){ if(!StringUtil.isEmpty(list)){
if(auditBatchCfg.getIsValid().equals(1)) { Map<Integer,List> asnIpMap=new HashMap();
}else { if(!StringUtil.isEmpty(list)) {
Map<Integer,List> asnIpMap=new HashMap(); for (AsnIpCfg obj : list) {
if(!StringUtil.isEmpty(list)) { BaseCfg baseCfg=(BaseCfg)obj;
for (AsnIpCfg obj : list) { if(!StringUtil.isEmpty(asnIpMap.get(obj.getAsnIpGroup()))) {
BaseCfg baseCfg=(BaseCfg)obj; asnIpMap.get(obj.getAsnIpGroup()).add(baseCfg);
if(!StringUtil.isEmpty(asnIpMap.get(obj.getAsnIpGroup()))) { asnIpMap.put(obj.getAsnIpGroup(), asnIpMap.get(obj.getAsnIpGroup()));
asnIpMap.get(obj.getAsnIpGroup()).add(baseCfg); }else {
asnIpMap.put(obj.getAsnIpGroup(), asnIpMap.get(obj.getAsnIpGroup())); List newList=new ArrayList<>();
}else { newList.add(baseCfg);
List newList=new ArrayList<>(); asnIpMap.put(obj.getAsnIpGroup(),newList);
newList.add(baseCfg);
asnIpMap.put(obj.getAsnIpGroup(),newList);
}
} }
} }
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData);
} }
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData);
}else{ }else{
hasData = false; hasData = false;
} }
@@ -3211,31 +3208,21 @@ public class BaseController {
List<AppIpCfg> list=appCfgService.findAppIpList(page, searchAppIpCfg).getList(); List<AppIpCfg> list=appCfgService.findAppIpList(page, searchAppIpCfg).getList();
if(!StringUtil.isEmpty(list)){ if(!StringUtil.isEmpty(list)){
if(auditBatchCfg.getIsValid().equals(1)) { Map<Integer,List> appIpMap=new HashMap();
//TODO 批量审核通过APP IP需要处理的问题：一批中存在一个APP 所有IP均未下发过的问题？待解决 if(!StringUtil.isEmpty(list)) {
//先查询所有的asn group，在根据asn group 查询所有未下发的asn ip for (AppIpCfg obj : list) {
BaseCfg baseCfg=(BaseCfg)obj;
//批量下发时，未下发过的app需要下发正常配置;已下发过的app需要下发ip复用配置（为保证事物，分两种方式下发） if(!StringUtil.isEmpty(appIpMap.get((groupMap.get(obj.getCompileId()))))) {
/*hasData=configSynchronizationService.auditDdosMaatData(cfgList,userRegionList, appIpMap.get(groupMap.get(obj.getCompileId())).add(baseCfg);
page,auditBatchCfg,list,hasData,true);*/ appIpMap.put(groupMap.get(obj.getCompileId()), appIpMap.get(groupMap.get(obj.getCompileId())));
}else {
}else { List newList=new ArrayList<>();
Map<Integer,List> appIpMap=new HashMap(); newList.add(baseCfg);
if(!StringUtil.isEmpty(list)) { appIpMap.put(groupMap.get(obj.getCompileId()),newList);
for (AppIpCfg obj : list) {
BaseCfg baseCfg=(BaseCfg)obj;
if(!StringUtil.isEmpty(appIpMap.get((groupMap.get(obj.getCompileId()))))) {
appIpMap.get(groupMap.get(obj.getCompileId())).add(baseCfg);
appIpMap.put(groupMap.get(obj.getCompileId()), appIpMap.get(groupMap.get(obj.getCompileId())));
}else {
List newList=new ArrayList<>();
newList.add(baseCfg);
appIpMap.put(groupMap.get(obj.getCompileId()),newList);
}
} }
} }
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,appIpMap,hasData);
} }
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,appIpMap,hasData);
}else{ }else{
hasData = false; hasData = false;
} }

37
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -192,10 +192,10 @@ $(function(){
} }
}); });
hiddenlevel(); hiddenlevel($("select[name='level']").val());
$(".action").on("change",function(){ $(".action").on("change",function(){
$("#serviceId").val($(this).attr("serviceId")); $("#serviceId").val($(this).attr("serviceId"));
hiddenlevel(); hiddenlevel(null);
}); });
$("#serviceId").val($(".action:checked").attr("serviceId")); $("#serviceId").val($(".action:checked").attr("serviceId"));
$("#cfgFrom").validate({ $("#cfgFrom").validate({
@@ -242,8 +242,9 @@ $(function(){
flag = validateEffectiveRuleLimit("${ctx}",serviceId); flag = validateEffectiveRuleLimit("${ctx}",serviceId);
} }
if(flag){ if(flag){
$("#cron .detail > div.disabled").remove();//删除disabled 的字段 //将disable属性的元素删除
form.submit(); $("#cron.disabled").remove();
form.submit();
} }
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
@@ -269,18 +270,20 @@ function openPicWindow(url){
}); });
} }
function hiddenlevel(){ function hiddenlevel(level){
var action=$("input[name='action']:checked").val(); if(level ==null){
if(action==16){ var action=$("input[name='action']:checked").val();
$(".level").addClass("hidden"); if(action==16){
$("select[name='level']").find("option").eq(0).attr("value","0"); $(".level").addClass("hidden");
$("select[name='level']").val("0"); $("select[name='level']").find("option").eq(0).attr("value","0");
$("select[name='level']").selectpicker("refresh"); $("select[name='level']").val("0");
}else { $("select[name='level']").selectpicker("refresh");
$(".level").removeClass("hidden"); }else {
$("select[name='level']").find("option").eq(0).attr("value",""); $(".level").removeClass("hidden");
$("select[name='level']").val("100"); $("select[name='level']").find("option").eq(0).attr("value","");
$("select[name='level']").selectpicker("refresh"); $("select[name='level']").val("90");
$("select[name='level']").selectpicker("refresh");
}
} }
} }
@@ -487,7 +490,7 @@ function sampleFileValidate(fileType,fileName){
<select name="level" data-live-search="true" class="selectpicker form-control required"> <select name="level" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option> <option value="0" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC"> <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> </c:forEach>
</select> </select>
</div> </div>

4
src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
View File

@@ -18,7 +18,7 @@ $(function(){
if($("#oldAction").val()==1&&$(".action:checked").attr("id")!="actionOff"){ if($("#oldAction").val()==1&&$(".action:checked").attr("id")!="actionOff"){
$(".level").removeClass("hidden"); $(".level").removeClass("hidden");
$(".level").find("select[name='level']").find("option").eq(0).attr("value",""); $(".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"); $(".level").find("select[name='level']").selectpicker("refresh");
}else{ }else{
$(".level").addClass("hidden"); $(".level").addClass("hidden");
@@ -38,7 +38,7 @@ $(function(){
if($(".action:checked").val()==1){ if($(".action:checked").val()==1){
$(".level").removeClass("hidden"); $(".level").removeClass("hidden");
$(".level").find("select[name$='level']").find("option").eq(0).attr("value",""); $(".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"); $(".level").find("select[name$='level']").selectpicker("refresh");
}else{ }else{
$(".level").addClass("hidden"); $(".level").addClass("hidden");

30
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
View File

@@ -15,11 +15,11 @@
sampleFileValidate(); sampleFileValidate();
}); });
hiddenlevel(); hiddenlevel($("select[name='cfdsLevel']").val());
$(".action").on("change", function() { $(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId")); $("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId")); $("#protocolId").val($(this).attr("protocolId"));
hiddenlevel(); hiddenlevel(null);
}); });
$("#serviceId").val($(".action:checked").attr("serviceId")); $("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId")); $("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -103,18 +103,20 @@
$("." + contentClassName).addClass("hidden").addClass("disabled"); $("." + contentClassName).addClass("hidden").addClass("disabled");
$("." + addBtnClassName).removeClass("hidden"); $("." + addBtnClassName).removeClass("hidden");
} }
function hiddenlevel(){ function hiddenlevel(level){
var action=$("input[name='action']:checked").val(); if(level ==null){
if(action==16){ var action=$("input[name='action']:checked").val();
$(".leveL").addClass("hidden"); if(action==16){
$("select[name='cfdsLevel']").find("option").eq(0).attr("value","1"); $(".leveL").addClass("hidden");
$("select[name='cfdsLevel']").val("1"); $("select[name='cfdsLevel']").find("option").eq(0).attr("value","1");
$("select[name='cfdsLevel']").selectpicker("refresh"); $("select[name='cfdsLevel']").val("1");
}else { $("select[name='cfdsLevel']").selectpicker("refresh");
$(".leveL").removeClass("hidden"); }else {
$("select[name='cfdsLevel']").find("option").eq(0).attr("value",""); $(".leveL").removeClass("hidden");
$("select[name='cfdsLevel']").val("90"); $("select[name='cfdsLevel']").find("option").eq(0).attr("value","");
$("select[name='cfdsLevel']").selectpicker("refresh"); $("select[name='cfdsLevel']").val("90");
$("select[name='cfdsLevel']").selectpicker("refresh");
}
} }
} }
// 校验文件后缀名 // 校验文件后缀名