From f284491963303a4d0debcb89ea22a276b9aba66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Tue, 19 Mar 2019 15:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E7=9A=84=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E5=BA=A6=E9=BB=98=E8=AE=A4=E5=80=BCbug=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=9B=20=E9=9F=B3=E8=A7=86=E9=A2=91=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6bug=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=9B=20=E6=89=B9=E9=87=8F=E9=85=8D=E7=BD=AE=E7=94=9F?= =?UTF-8?q?=E6=95=88=E5=8E=BB=E6=8E=89=E6=97=A0=E6=95=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 61 ++++++++----------- .../WEB-INF/views/cfg/av/fileSampleForm.jsp | 37 +++++------ .../WEB-INF/views/cfg/av/switchSignSample.jsp | 4 +- .../views/cfg/fileTransfer/fileDigestForm.jsp | 30 ++++----- 4 files changed, 62 insertions(+), 70 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index d30c596c6..da1d59524 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3137,24 +3137,21 @@ public class BaseController { List list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList(); if(!StringUtil.isEmpty(list)){ - if(auditBatchCfg.getIsValid().equals(1)) { - }else { - Map asnIpMap=new HashMap(); - if(!StringUtil.isEmpty(list)) { - for (AsnIpCfg obj : list) { - BaseCfg baseCfg=(BaseCfg)obj; - if(!StringUtil.isEmpty(asnIpMap.get(obj.getAsnIpGroup()))) { - asnIpMap.get(obj.getAsnIpGroup()).add(baseCfg); - asnIpMap.put(obj.getAsnIpGroup(), asnIpMap.get(obj.getAsnIpGroup())); - }else { - List newList=new ArrayList<>(); - newList.add(baseCfg); - asnIpMap.put(obj.getAsnIpGroup(),newList); - } + Map asnIpMap=new HashMap(); + if(!StringUtil.isEmpty(list)) { + for (AsnIpCfg obj : list) { + BaseCfg baseCfg=(BaseCfg)obj; + if(!StringUtil.isEmpty(asnIpMap.get(obj.getAsnIpGroup()))) { + asnIpMap.get(obj.getAsnIpGroup()).add(baseCfg); + asnIpMap.put(obj.getAsnIpGroup(), asnIpMap.get(obj.getAsnIpGroup())); + }else { + List newList=new ArrayList<>(); + newList.add(baseCfg); + asnIpMap.put(obj.getAsnIpGroup(),newList); } } - hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData); } + hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData); }else{ hasData = false; } @@ -3211,31 +3208,21 @@ public class BaseController { List 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 appIpMap=new HashMap(); - if(!StringUtil.isEmpty(list)) { - 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); - } + Map appIpMap=new HashMap(); + if(!StringUtil.isEmpty(list)) { + 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{ hasData = false; } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index 80ce3e030..69586a1a1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -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,8 +242,9 @@ $(function(){ flag = validateEffectiveRuleLimit("${ctx}",serviceId); } if(flag){ - $("#cron .detail > div.disabled").remove();//删除disabled 的字段 - form.submit(); + //将disable属性的元素删除 + $("#cron.disabled").remove(); + form.submit(); } }, errorContainer: "#messageBox", @@ -269,18 +270,20 @@ function openPicWindow(url){ }); } -function hiddenlevel(){ - var action=$("input[name='action']:checked").val(); - if(action==16){ - $(".level").addClass("hidden"); - $("select[name='level']").find("option").eq(0).attr("value","0"); - $("select[name='level']").val("0"); - $("select[name='level']").selectpicker("refresh"); - }else { - $(".level").removeClass("hidden"); - $("select[name='level']").find("option").eq(0).attr("value",""); - $("select[name='level']").val("100"); - $("select[name='level']").selectpicker("refresh"); +function hiddenlevel(level){ + if(level ==null){ + var action=$("input[name='action']:checked").val(); + if(action==16){ + $(".level").addClass("hidden"); + $("select[name='level']").find("option").eq(0).attr("value","0"); + $("select[name='level']").val("0"); + $("select[name='level']").selectpicker("refresh"); + }else { + $(".level").removeClass("hidden"); + $("select[name='level']").find("option").eq(0).attr("value",""); + $("select[name='level']").val("90"); + $("select[name='level']").selectpicker("refresh"); + } } } @@ -487,7 +490,7 @@ function sampleFileValidate(fileType,fileName){ diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp index 7bff38819..0bf4718c3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp @@ -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"); diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index a1f7c8cbb..97b73d36e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -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,18 +103,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"); + function hiddenlevel(level){ + if(level ==null){ + 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"); + } } } // 校验文件后缀名