From f3e726e0c1b16057683666a0923105ebf5b46b27 Mon Sep 17 00:00:00 2001 From: shangguanyanfei Date: Thu, 11 Jul 2019 17:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B=E9=9D=A2=E7=9A=84=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=8E=BB=E6=8E=89=E5=9C=B0=E5=9F=9F?= =?UTF-8?q?=E5=92=8C=E8=BF=90=E8=90=A5=E5=95=86=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/ntc/MailRecordLogController.java | 2 +- .../dashboard/trafficActionTransList.jsp | 11 ++- .../views/dashboard/trafficAppTrendList.jsp | 94 +++++++++---------- .../views/dashboard/trafficAppTypeList.jsp | 20 ++-- .../views/dashboard/trafficBandwidthList.jsp | 31 +++--- .../views/dashboard/trafficDomainTrans.jsp | 6 +- .../views/dashboard/trafficIpActiveList.jsp | 30 +++--- .../dashboard/trafficProtocolTypeList.jsp | 16 ++-- .../views/dashboard/trafficWebTypeList.jsp | 22 ++--- .../views/log/manipulation/dkBehaviorList.jsp | 9 +- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 9 +- .../views/log/ntc/connRecordLogList.jsp | 14 +-- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 10 +- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 9 +- .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 8 +- .../WEB-INF/views/log/ntc/httpKeyList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 10 +- .../WEB-INF/views/log/ntc/httpRecordList.jsp | 10 +- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 9 +- .../WEB-INF/views/log/ntc/ipWhiteList.jsp | 9 +- .../WEB-INF/views/log/ntc/irDnatLogList.jsp | 10 +- .../WEB-INF/views/log/ntc/irSnatLogList.jsp | 10 +- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 4 +- .../WEB-INF/views/log/ntc/mailRecordList.jsp | 10 +- .../views/log/ntc/mmFileDigestList.jsp | 10 +- .../views/log/ntc/mmPornVideoSampleList.jsp | 10 +- .../views/log/ntc/mmSampleAudioList.jsp | 10 +- .../views/log/ntc/mmSampleFaceList.jsp | 10 +- .../views/log/ntc/mmSampleLogoList.jsp | 10 +- .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 10 +- .../views/log/ntc/mmSampleSpeakerList.jsp | 10 +- .../views/log/ntc/mmSampleVideoList.jsp | 10 +- .../views/log/ntc/mmSampleVoipList.jsp | 10 +- .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 10 +- .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 10 +- .../WEB-INF/views/log/ntc/openVpnList.jsp | 9 +- .../webapp/WEB-INF/views/log/ntc/p2pList.jsp | 10 +- .../WEB-INF/views/log/ntc/radiusLogList.jsp | 10 +- .../WEB-INF/views/log/ntc/sslLogList.jsp | 10 +- .../views/log/ntc/sslRecordLogList.jsp | 10 +- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 10 +- 41 files changed, 278 insertions(+), 258 deletions(-) diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java index 753d2cb42..73cd5a3ce 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java @@ -97,7 +97,7 @@ public class MailRecordLogController extends BaseController { @RequestMapping(value = "exportMail") public void exportMail(@ModelAttribute("log") NtcMailLog log, Model model, String hColumns, String type, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { - System.out.println("进来了Mail泛收"); +// System.out.println("进来了Mail泛收"); try { // export data info List titleList = new ArrayList(); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp index 7c1b5764a..cafb46cbd 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp @@ -177,6 +177,10 @@ function showActionTransChart(xData,series){ credits:{//是否有highcharts水印 enabled:false }, + + legend: { + enabled: false + }, plotOptions: { series: { marker: { @@ -214,13 +218,16 @@ function showActionTransChart(xData,series){ total.push( d.sum ) - var entrance=""; + var entrance=" "; if(d!=null&&d.entranceId==1){ + entrance="Astana+Almaty"; + } + /* if(d!=null&&d.entranceId==1){ entrance="Astana"; } if(d!=null&&d.entranceId==2){ entrance="Almaty"; - } + } */ series.push({ name: entrance, data: d.result, diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp index a15980d05..4f9aa0fb1 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp @@ -38,7 +38,7 @@
-
+ <%--
@@ -61,12 +61,11 @@
-
+
--%>
-
+ <%--
@@ -123,20 +122,19 @@ -
+
--%>
-
+ <%--
-
+
--%>
-
+ <%--
@@ -81,7 +81,7 @@ -
+
--%>
@@ -144,8 +144,8 @@ $(document).ready(function(){ var endh=$("#endDateh").val(); $("#beginDate").val(starth); $("#endDate").val(endh); - var entranceId=$("#entranceId").val(); - ajaxAppList(starth,endh,entranceId); +// var entranceId=$("#entranceId").val(); + ajaxAppList(starth,endh); //筛选功能初始化 $("#resetBtn").on("click",function(){ $("select.selectpicker").each(function(){ @@ -167,21 +167,21 @@ function searchList(){ var end=$("#endDate").val(); $("#beginDateh").val(start); $("#endDateh").val(end); - var entranceId = $("#entranceId").val(); +// var entranceId = $("#entranceId").val(); if(start==''||end==''||end==null||start==null){ window.location.reload(); }else{ - ajaxAppList(start,end,entranceId); + ajaxAppList(start,end); } } -function ajaxAppList(start,end,entranceId){ +function ajaxAppList(start,end){ var appType=$("#appType").val(); loading(); $.ajax({ url: '${ctx}/dashboard/traffic/appList', type: 'get', dataType: "json", - data:{"beginDate":start,"endDate":end,"appType":appType,"entranceId":entranceId}, + data:{"beginDate":start,"endDate":end,"appType":appType}, async:true, timeout:50000, traditional:true, @@ -381,8 +381,8 @@ function htmlData(fileDataS){ function openAppTrend(appType){ var beginDate=$("#beginDateh").val(); var endDate=$("#endDateh").val(); - var entranceId = $("#entranceId").val(); - var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appType="+appType+"&entranceId="+entranceId; +// var entranceId = $("#entranceId").val(); + var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appType="+appType; window.location.href=(url) } /** diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp index 78b2ad19d..5f22c0509 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp @@ -93,7 +93,7 @@
-
+
@@ -176,12 +176,19 @@ function changeBandwidth(unitType,beginDate,endDate){ var udpdata2=null; var total=[]; var total2=[]; - if(data!=null&&Object.keys(data).length>0){ + /* if(data!=null&&Object.keys(data).length>0){ ipv4data=data.ipv4Type1.result; ipv6data=data.ipv6Type1.result; tcpdata=data.trans6Type1.result; udpdata=data.trans17Type1.result; total.push(data.ipv4Type1.sum,data.ipv6Type1.sum,data.trans6Type1.sum,data.trans17Type1.sum); + } */ + if(data!=null&&Object.keys(data).length>0){ + ipv4data=data.ipv4Type.result; + ipv6data=data.ipv6Type.result; + tcpdata=data.trans6Type.result; + udpdata=data.trans17Type.result; + total.push(data.ipv4Type.sum,data.ipv6Type.sum,data.trans6Type.sum,data.trans17Type.sum); } var series=new Array(); series.push({ @@ -222,9 +229,9 @@ function changeBandwidth(unitType,beginDate,endDate){ } }); $("#total").val(JSON.stringify(total)); - showBandwidthChart("chart1",unitType,xdata,series,"Astana"); + showBandwidthChart("chart1",unitType,xdata,series,""); - if(data!=null&&Object.keys(data).length>0){ + /* if(data!=null&&Object.keys(data).length>0){ ipv4data2=data.ipv4Type2.result; ipv6data2=data.ipv6Type2.result; tcpdata2=data.trans6Type2.result; @@ -271,7 +278,7 @@ function changeBandwidth(unitType,beginDate,endDate){ } }); $("#total2").val(JSON.stringify(total2)); - showBandwidthChart("chart2",unitType,xdata,series,"Almaty"); + showBandwidthChart("chart2",unitType,xdata,series,"Almaty"); */ closeTip(); }, error: function(data, textStatus, errorThrown){ @@ -343,7 +350,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){ rotation: -45, //倾斜的角度 }, */ title: { - text: 'time-'+title, + text: 'time', align:'high', }, type: 'datetime', @@ -426,14 +433,15 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){ var map={}; $(rows).each(function(i,d){ if(d!=null){ - if(i==0){ + total=JSON.parse($("#total").val()); + /* if(i==0){ if(d[0].indexOf("Astana") != -1){ total=JSON.parse($("#total").val()); } if(d[0].indexOf("Almaty") != -1){ total=JSON.parse($("#total2").val()); } - } + } */ } // 去掉多余属性 delete d.name; @@ -515,12 +523,13 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){ $(rows).each(function (i,d){ if(d!=null){ if(i==0){ - if(d[0].indexOf("Astana") != -1){ + total=JSON.parse($("#total").val()); + /* if(d[0].indexOf("Astana") != -1){ total=JSON.parse($("#total").val()); } if(d[0].indexOf("Almaty") != -1){ total=JSON.parse($("#total2").val()); - } + } */ } if(i>0){ data.push({ diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp index d56503957..042a42e26 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp @@ -22,7 +22,7 @@ - + <%-- --%> @@ -51,13 +51,13 @@ $(document).ready(function(){ loading(); var beginDate=$("#beginDate").val(); var endDate=$("#endDate").val(); - var entranceId=$("#entranceId").val(); +// var entranceId=$("#entranceId").val(); var domain=$("#domain").val(); $.ajax({ url: '${ctx}/dashboard/traffic/ajaxDomainTrans', type : "get" , dataType:"json", - data:{"beginDate":beginDate,"endDate":endDate,"entranceId":entranceId,"domain":domain}, + data:{"beginDate":beginDate,"endDate":endDate,"domain":domain}, async:true, timeout:50000, success:function (rs) { diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 25765ea7e..f18cec49e 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -43,7 +43,7 @@
-
+ <%--
@@ -53,7 +53,7 @@ -
+
--%>
@@ -91,7 +91,7 @@ - + <%-- --%> @@ -136,9 +136,9 @@ $(document).ready(function(){ var endh=$("#endDateh").val(); $("#beginDate").val(starth); $("#endDate").val(endh); - var entranceId=$("#entranceId").val(); - ipActiveMinuteList(starth,endh,entranceId); - ipActiveOneHourList(starth,endh,entranceId); +// var entranceId=$("#entranceId").val(); + ipActiveMinuteList(starth,endh); + ipActiveOneHourList(starth,endh); //筛选功能初始化 $("#resetBtn").on("click",function(){ $("select.selectpicker").each(function(){ @@ -230,13 +230,13 @@ function searchList(){ var end=$("#endDate").val(); $("#beginDateh").val(start); $("#endDateh").val(end); - var entranceId=$("#entranceId").val(); +// var entranceId=$("#entranceId").val(); loading(); if(start==''||end==''||end==null||start==null){ window.location.reload(); }else{ - ipActiveMinuteList(start,end,entranceId); - ipActiveOneHourList(start,end,entranceId); + ipActiveMinuteList(start,end); + ipActiveOneHourList(start,end); } } @@ -337,13 +337,13 @@ function showIpActiveChart(xData,series){ }); } //活跃IP一小时间隔五分钟统计 - function ipActiveMinuteList(beginDate,endDate,entranceId){ + function ipActiveMinuteList(beginDate,endDate){ loading(); $.ajax({ url: '${ctx}/dashboard/ipActiveMinuteList', type : "get", dataType:"json", - data:{"beginDate":beginDate,"endDate":endDate,"entranceId":entranceId}, + data:{"beginDate":beginDate,"endDate":endDate}, async:true, timeout:50000, success:function (rs) { @@ -382,14 +382,14 @@ function showIpActiveChart(xData,series){ }); } //活跃IP一小时统计 - function ipActiveOneHourList(beginDate,endDate,entranceId){ + function ipActiveOneHourList(beginDate,endDate){ $("#tbodyData").html(""); loading(); $.ajax({ url: '${ctx}/dashboard/ajaxIpActiveList', type : "get" , dataType:"json", - data:{"beginDate":beginDate,"endDate":endDate,"entranceId":entranceId}, + data:{"beginDate":beginDate,"endDate":endDate}, async:true, timeout:50000, success:function (data) { @@ -415,7 +415,7 @@ function showIpActiveChart(xData,series){ var html = ""; html+= ""+rs.ipAddr+""; - html+= ""+(rs.areaId==1? "Astana":"Almaty")+""; +// html+= ""+(rs.areaId==1? "Astana":"Almaty")+""; html+= ""+rs.c2sByteLen+""; html+= ""+rs.s2cByteLen+""; html+= ""+byteNum+""; @@ -431,7 +431,7 @@ function showIpActiveChart(xData,series){ if(i==data.length-1){ html+="" html+= ""+""+""; - html+= ""+"--"+""; + // html+= ""+"--"+""; html+= ""+totalc2sByte+""; html+= ""+totals2cByte+""; html+= ""+totalByte+""; diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp index 2dd586a21..7b1b3c98c 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp @@ -59,7 +59,7 @@
-
+ <%--
@@ -69,7 +69,7 @@ -
+
--%>
@@ -154,8 +154,8 @@ $(document).ready(function(){ var endh=$("#endDateh").val(); $("#beginDate").val(starth); $("#endDate").val(endh); - var entranceId=$("#entranceId").val(); - ajaxProtocolList(starth,endh,entranceId); +// var entranceId=$("#entranceId").val(); + ajaxProtocolList(starth,endh); //筛选功能初始化 $("#resetBtn").on("click",function(){ $("select.selectpicker").each(function(){ @@ -176,16 +176,16 @@ function searchList(){ loading(); var start=$("#beginDate").val(); var end=$("#endDate").val(); - var entranceId=$("#entranceId").val(); +// var entranceId=$("#entranceId").val(); $("#beginDateh").val(start); $("#endDateh").val(end); if(start==''||end==''||end==null||start==null){ window.location.reload(); }else{ - ajaxProtocolList(start,end,entranceId); + ajaxProtocolList(start,end); } } -function ajaxProtocolList(start,end,entranceId){ +function ajaxProtocolList(start,end){ var protoType=$("#protoType").val(); var searchDirection=$("#searchDirection").val(); loading(); @@ -193,7 +193,7 @@ function ajaxProtocolList(start,end,entranceId){ url: '${ctx}/dashboard/traffic/protocolList', type: 'get', dataType: "json", - data:{"beginDate":start,"endDate":end,"protoType":protoType,"entranceId":entranceId,"searchDirection":searchDirection}, + data:{"beginDate":start,"endDate":end,"protoType":protoType,"searchDirection":searchDirection}, async:true, timeout:50000, traditional:true, diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index a98b0f294..d808970be 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -80,7 +80,7 @@
-
+ <%--
@@ -90,8 +90,8 @@ -
-
+
--%> +