From 15ec139701e81066ce4a006d494fb94e6459fd23 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 30 Nov 2018 14:07:06 +0800 Subject: [PATCH] =?UTF-8?q?ddos=E4=B8=8B=E5=8F=91=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E5=8F=82=E5=8D=8F=E8=AE=AE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E9=98=88=E5=80=BC=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=8D=8F=E8=AE=AE=E4=B8=8D=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=88=99=E9=98=88=E5=80=BC=E8=87=B3=E5=B0=91=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=A4=A7=E4=BA=8E0=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=B3=A8=E9=87=8A=E8=B7=9F?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/dao/UserDao.xml | 50 +++++++++---------- .../service/configuration/DdosCfgService.java | 8 ++- .../WEB-INF/views/cfg/ddosIpCfgForm.jsp | 20 ++++++++ 3 files changed, 51 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/nis/web/dao/UserDao.xml b/src/main/java/com/nis/web/dao/UserDao.xml index c067e91e0..c33c61d54 100644 --- a/src/main/java/com/nis/web/dao/UserDao.xml +++ b/src/main/java/com/nis/web/dao/UserDao.xml @@ -229,32 +229,32 @@ u.identity, u.email, u.create_time, - u.status, - u.company_id AS "company.id", - c.name AS "company.name", - c.parent_id AS "company.parent.id", - c.parent_ids AS "company.parentIds", - c.type AS "company.type", - c.grade AS "company.grade", - c.job_type AS "company.job_type", - u.entity_id AS "entity.id", - e.name AS "entity.name", - e.parent_id AS "entity.parent.id", - e.parent_ids AS "entity.parentIds", - e.type AS "entity.type", - e.grade AS "entity.grade", - e.job_type AS "entity.job_type", - u.office_id AS "office.id", - o.name AS "office.name", - o.parent_id AS "office.parent.id", - o.parent_ids AS "office.parentIds", - o.type AS "office.type", - o.grade AS "office.grade", - o.job_type AS "office.job_type" + u.status + + + + + + + + + + + + + + + + + + + + + from sys_user u - LEFT JOIN sys_office c ON c.id = u.company_id AND c.useable=1 - LEFT JOIN sys_office e ON e.id=u.entity_id AND e.useable=1 - LEFT JOIN sys_office o ON o.id=u.office_id AND o.useable=1 + + + WHERE u.status=#{DEL_FLAG_NORMAL} diff --git a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java index 79a88acc4..ac538f437 100644 --- a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java @@ -75,12 +75,14 @@ public class DdosCfgService extends BaseService{ Long ppsThreadshold = entity.getPpsThreadshold(); if(StringUtil.isBlank(antiddosProtocol)) { entity.setAntiddosProtocol(""); + entity.setBpsThreadshold(0l); + entity.setBpsThreadshold(0l); } if(bpsThreadshold==null) { entity.setBpsThreadshold(0l); } if(ppsThreadshold==null) { - entity.setPpsThreadshold(0l); + entity.setBpsThreadshold(0l); } //新增 if(entity.getCfgId()==null){ @@ -242,12 +244,14 @@ public class DdosCfgService extends BaseService{ Map umap= new HashMap(); if(StringUtil.isBlank(antiddosProtocol)) { antiddosProtocol=""; + bpsThreadshold=0l; + bpsThreadshold=0l; } if(bpsThreadshold==null) { bpsThreadshold=0l; } if(ppsThreadshold==null) { - ppsThreadshold=0l; + bpsThreadshold=0l; } umap.put("protocol", antiddosProtocol); umap.put("bps_threadshold", bpsThreadshold); diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp index 40bd5fba2..d717125e5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp @@ -9,6 +9,26 @@ $(function(){ /* $("#cancel").on("click",function(){ window.history.back(); });*/ + var ddosProtocol=$("#antiddosProtocol").val(); + if(ddosProtocol==null||ddosProtocol==""){ + $("#bpsThreadshold").attr("disabled","true"); + $("#ppsThreadshold").attr("disabled","true"); + } + $("#antiddosProtocol").on("change",function(){ + var ddosProtocol=$("#antiddosProtocol").val(); + if(ddosProtocol==null||ddosProtocol==""){ + $("#bpsThreadshold").attr("disabled","true"); + $("#ppsThreadshold").attr("disabled","true"); + $("#bpsThreadshold").val(""); + $("#bpsThreadshold").attr("placeholder","Bit Per Second"); + $("#ppsThreadshold").val(""); + $("#ppsThreadshold").attr("placeholder","Packet Per Second"); + }else{ + $("#bpsThreadshold").removeAttr("disabled"); + $("#ppsThreadshold").removeAttr("disabled"); + } + }) + $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId"));