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

优化 Traffic性能

Browse Source
This commit is contained in:
tanghao
2018-12-17 23:42:59 +08:00
parent 570a98f87a
commit 3ef37ce356
4 changed files with 252 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
View File

@@ -91,15 +91,15 @@ $(document).ready(function(){
$("#endDate").val(endh);
var unitType=$("#unitType").val();
changeBandwidth(unitType,starth,endh);
changeBandwidth2(unitType,starth,endh);
//changeBandwidth2(unitType,starth,endh);
$("#unitType").on("change",function(){
changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
// changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
});
setInterval(function(){
changeBandwidth($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
changeBandwidth2($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
// changeBandwidth2($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
},500000);// 五分钟调用一次
//筛选功能初始化
@@ -122,12 +122,12 @@ function searchList(){
window.location.reload();
}else{
changeBandwidth($("#unitType").val(),start,end);
changeBandwidth2($("#unitType").val(),start,end);
// changeBandwidth2($("#unitType").val(),start,end);
}
}
// 默认显示四条线 ip46,tcp,udp
function rankItemChanged(addrType,transType,beginDate,endDate){
/* function rankItemChanged(addrType,transType,beginDate,endDate){
loading();
var result=null;
$.ajax({
@@ -177,32 +177,70 @@ function rankItemChanged2(addrType,transType,beginDate,endDate){
}
});
return result2;
} */
function rankItemChanged3(beginDate,endDate){
loading();
var result=null;
$.ajax({
url:"${ctx}/dashboard/traffic/bandwidthTransThree",
type:"get",
data:{"beginDate":beginDate,"endDate":endDate},
dataType:"json",
async:false,
timeout:40000,
success:function (data){
if(data!=null){
console.log(4444);
result=data;
}
closeTip();
},
error: function(data, textStatus, errorThrown){
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
return result;
}
// 根据单位切换数据
function changeBandwidth(unitType,beginDate,endDate){
var ipv4=rankItemChanged(4,null,beginDate,endDate);
/* var ipv4=rankItemChanged(4,null,beginDate,endDate);
var ipv6=rankItemChanged(6,null,beginDate,endDate);
var transTcp=rankItemChanged(null,6,beginDate,endDate);
var transUdp=rankItemChanged(null,17,beginDate,endDate);
var xdata=ipv4.statTime;
if(unitType=="Gbps"){
ipv4data=ipv4.gbps;
ipv6data=ipv6.gbps;
tcpdata=transTcp.gbps;
udpdata=transUdp.gbps;
}
if(unitType=="pps"){
ipv4data=ipv4.pps;
ipv6data=ipv6.pps;
tcpdata=transTcp.pps;
udpdata=transUdp.pps;
}
if(unitType=="linkNumber"){
ipv4data=ipv4.linkNum;
ipv6data=ipv6.linkNum;
tcpdata=transTcp.linkNum;
udpdata=transUdp.linkNum;
var transUdp=rankItemChanged(null,17,beginDate,endDate); */
var data=rankItemChanged3(beginDate,endDate);
var xdata=null;
var ipv4data=null;
var ipv6data=null;
var tcpdata=null;
var udpdata=null;
var ipv4data2=null;
var ipv6data2=null;
var tcpdata2=null;
var udpdata2=null;
if(Object.keys(data).length>0){
xdata=data.ipv4Type1[0].statTime;
if(unitType=="Gbps"){
ipv4data=data.ipv4Type1[0].gbps;
ipv6data=data.ipv6Type1[0].gbps;
tcpdata=data.trans6Type1[0].gbps;
udpdata=data.trans17Type1[0].gbps;
}
if(unitType=="pps"){
ipv4data=data.ipv4Type1.pps;
ipv6data=data.ipv6Type1.pps;
tcpdata=data.trans6Type1.pps;
udpdata=data.trans17Type1.pps;
}
if(unitType=="linkNumber"){
ipv4data=data.ipv4Type1.linkNum;
ipv6data=data.ipv6Type1.linkNum;
tcpdata=data.trans6Type1.linkNum;
udpdata=data.trans17Type1.linkNum;
}
}
var series=new Array();
series.push({
@@ -219,6 +257,44 @@ function changeBandwidth(unitType,beginDate,endDate){
data: udpdata
});
showBandwidthChart("chart1",unitType,xdata,series,"Astana");
if(Object.keys(data).length>0){
if(unitType=="Gbps"){
ipv4data2=data.ipv4Type2[0].gbps;
ipv6data2=data.ipv6Type2[0].gbps;
tcpdata2=data.trans6Type2[0].gbps;
udpdata2=data.trans17Type2[0].gbps;
}
if(unitType=="pps"){
ipv4data2=data.ipv4Type2.pps;
ipv6data2=data.ipv6Type2.pps;
tcpdata2=data.trans6Type2.pps;
udpdata2=data.trans17Type2.pps;
}
if(unitType=="linkNumber"){
ipv4data2=data.ipv4Type2.linkNum;
ipv6data2=data.ipv6Type2.linkNum;
tcpdata2=data.trans6Type2.linkNum;
udpdata2=data.trans17Type2.linkNum;
}
}
var series=new Array();
series.push({
name: "IPv4",
data: ipv4data2
},{
name: "IPv6",
data: ipv6data2
},{
name: "TCP",
data: tcpdata2
},{
name: "UDP",
data: udpdata2
});
showBandwidthChart("chart2",unitType,xdata,series,"Alamty");
}
// 根据单位切换数据
function changeBandwidth2(unitType,beginDate,endDate){