diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java index 0064e5526..49d44b3e4 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -267,7 +267,7 @@ public class DashboardController extends BaseController{ //两个时间段之间的秒数 double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate)); for(TrafficIpActiveStatistic data:list) { - data.setAvgByte(lf.format(Long.parseLong(data.get_byte())*8/allSeconds)); + data.setAvgByte(lf.format(Long.parseLong(data.get_byte())/1024/1024/1024/allSeconds)); data.setAvgPacket(lf.format(Long.parseLong(data.get_packet())/allSeconds)); } } diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index a5066ad63..62cc65306 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -346,7 +346,7 @@ public class TrafficStatisticsInfoController extends BaseController { m.put("linkNum", lf.format(m.get("linkNum"))); double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds; m.put("pps",lf.format(avgPacket)); - double avgByte=Double.parseDouble(m.get("GByte").toString())*1024*1024*1024*8/allSeconds; + double avgByte=Double.parseDouble(m.get("GByte").toString())/allSeconds; m.put("bps",lf.format(avgByte)); totalLink+=Long.parseLong( m.get("linkNum").toString()); totalPackets+=Long.parseLong(m.get("packets").toString()); @@ -435,7 +435,7 @@ public class TrafficStatisticsInfoController extends BaseController { double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds; m.put("pps",lf.format(avgPacket)); - double avgByte=Double.parseDouble(m.get("GByte").toString())*1024*1024*1024*8/allSeconds; + double avgByte=Double.parseDouble(m.get("GByte").toString())/allSeconds; m.put("bps",lf.format(avgByte)); } for (Object object : list) { @@ -545,7 +545,7 @@ public class TrafficStatisticsInfoController extends BaseController { for(Map m:list) { double avgPacket=Double.parseDouble(m.get("pktNum").toString())/allSeconds; m.put("pps",dl.format(avgPacket)); - double avgByte=Double.parseDouble(m.get("byteNum").toString())*8/allSeconds; + double avgByte=Double.parseDouble(m.get("byteNum").toString())/1024/1024/1024/allSeconds; m.put("bps",dl.format(avgByte)); } } @@ -664,7 +664,7 @@ public class TrafficStatisticsInfoController extends BaseController { double avgPacket=Double.parseDouble(m.get("pktCount").toString())/allSeconds; m.put("pps",dl.format(avgPacket)); - double avgByte=Double.parseDouble(m.get("byteCount").toString())*8/allSeconds; + double avgByte=Double.parseDouble(m.get("byteCount").toString())/1024/1024/1024/allSeconds; m.put("bps",dl.format(avgByte)); } List codeList = appCfgService.getDomainDict(new WebsiteDomainTopic()); @@ -746,7 +746,7 @@ public class TrafficStatisticsInfoController extends BaseController { totalGByte+=Double.parseDouble(lf.format(m.get("count"))); double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds; m.put("pps",lf.format(avgPacket)); - double avgByte=Double.parseDouble(m.get("count").toString())*8/allSeconds; + double avgByte=Double.parseDouble(m.get("count").toString())/1024/1024/1024/allSeconds; m.put("bps",lf.format(avgByte)); m.remove("domainData"); Double value1=0d; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 74ac69470..1d0c3faf8 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1475,7 +1475,6 @@ block_drop=Block(Drop) mail_record=Mail Records ssl_record=SSL Records http_record=HTTP Records -second_bps=bps ip_existed=IP has existed! user_check=In use, Can not be deleted! deletedAsnTip=The asnId ASN configuration with ID cfgId is deleted; diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 11a8f8d3e..9c15b1e46 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -44,7 +44,6 @@ domain_control=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043 dns_control=DNS basic_configuration=\u0411\u0430\u0437\u043e\u0432\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f Request_from=\u041f\u0438\u0441\u044c\u043c\u0435\u043d\u043d\u044b\u0439 \u043e\u0444\u0438\u0441 -second_bps=bps classification_manage=\u041a\u043b\u0430\u0441\u0441\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f area_manage=\u0420\u0435\u0433\u0438\u043e\u043d feature_scope_manage=\u041e\u0431\u043b\u0430\u0441\u0442\u044c \u043f\u0440\u0438\u0437\u043d\u0430\u043a\u043e\u0432 @@ -1481,7 +1480,7 @@ mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438 http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438 ip_existed=IP \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442! -user_check=\u0414\u0430\u043D\u043D\u044B\u0439 \u043E\u0431\u044A\u0435\u043A\u0442 \u0437\u0430\u043D\u044F\u0442, \u043D\u0435\u043B\u044C\u0437\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C! -deletedAsnTip=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u2116 cfgId \u0441 ASN asnId \u0431\u044B\u043B\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0430; -reedit=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0439\u0442\u0435 \u0437\u0430\u043D\u043E\u0432\u043E! +user_check=\u0414\u0430\u043d\u043d\u044b\u0439 \u043e\u0431\u044a\u0435\u043a\u0442 \u0437\u0430\u043d\u044f\u0442, \u043d\u0435\u043b\u044c\u0437\u044f \u0443\u0434\u0430\u043b\u0438\u0442\u044c! +deletedAsnTip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u2116 cfgId \u0441 ASN asnId \u0431\u044b\u043b\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0430; +reedit=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0443\u0439\u0442\u0435 \u0437\u0430\u043d\u043e\u0432\u043e! intercep_domain_required_tip=Domain is required \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 0cfa977a9..f37af4179 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1475,9 +1475,8 @@ block_drop=\u5c01\u5835(\u4e22\u5f03) mail_record=\u90ae\u4ef6\u6cdb\u6536 ssl_record=SSL\u6cdb\u6536 http_record=HTTP\u6cdb\u6536 -second_bps=bps -ip_existed=IP\u5DF2\u5B58\u5728\uFF01 -user_check=\u6B63\u5728\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5220\u9664\uFF01 -deletedAsnTip=\u914D\u7F6EID\u4E3AcfgId\u7684asnId ASN\u914D\u7F6E\u5DF2\u88AB\u5220\u9664; -reedit=\u8BF7\u91CD\u65B0\u7F16\u8F91\uFF01 -intercep_domain_required_tip=\u57DF\u540D\u4FE1\u606F\u5FC5\u987B\u914D\u7F6E \ No newline at end of file +ip_existed=IP\u5df2\u5b58\u5728\uff01 +user_check=\u6b63\u5728\u4f7f\u7528\uff0c\u4e0d\u80fd\u5220\u9664\uff01 +deletedAsnTip=\u914d\u7f6eID\u4e3acfgId\u7684asnId ASN\u914d\u7f6e\u5df2\u88ab\u5220\u9664; +reedit=\u8bf7\u91cd\u65b0\u7f16\u8f91\uff01 +intercep_domain_required_tip=\u57df\u540d\u4fe1\u606f\u5fc5\u987b\u914d\u7f6e \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp index d287d16a5..b1b042e5f 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp @@ -196,11 +196,11 @@ () + () + () - - @@ -376,11 +376,11 @@ html += "" + data.logPercent + " %"; // html += "" + (((data.entranceId)==1) ? "Astana":"Almaty") + ""; html += "" + Math.round(data.pktNum*100)/100 + ""; + html += "" + data.pps + ""; html += "" + data.pktPercent + " %"; html += "" + Math.round(data.byteNum*100)/100 + ""; - html += "" + data.bytePercent + " %"; - html += "" + data.pps + ""; html += "" + data.bps + ""; + html += "" + data.bytePercent + " %"; html += "" if(index==fileDataS.length-1){ html+="" @@ -390,8 +390,8 @@ html+= "" +"--"+""; html+= ""+totalpkt+""; html+= ""+"--"+""; - html+= ""+totalbyte+""; html+= ""+"--"+""; + html+= ""+totalbyte+""; html+= ""+"--"+""; html+= ""+"--"+""; html+="" diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp index 9cdedb02e..13b9ca7f3 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp @@ -117,11 +117,11 @@ () + () + () - - @@ -352,11 +352,11 @@ function htmlData(fileDataS){ html+= ""+data.linkNum+""; html+= ""+linkper+"%"+""; html+= ""+Math.round(data.packets*100)/100+""; + html+= ""+data.pps+""; html+= ""+packper+"%"+""; html+= ""+Math.round(data.GByte*100)/100+""; - html+= ""+gbytper+"%"+""; - html+= ""+data.pps+""; html+= ""+data.bps+""; + html+= ""+gbytper+"%"+""; html+="" if(index==fileDataS.length-1){ html+="" @@ -365,11 +365,11 @@ function htmlData(fileDataS){ html+= ""+totalLink+""; html+= "" +"100%"+""; html+= ""+Math.round(totalPackets*100)/100+""; + html+= ""+"--"+""; html+= ""+"100%"+""; html+= ""+Math.round(totalGByte*100)/100+""; + html+= ""+"--"+""; html+= ""+"100%"+""; - html+= ""+"--"+""; - html+= ""+"--"+""; html+="" } } diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp index d376944b8..ce2e2ec07 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp @@ -79,11 +79,11 @@ () + () + () - - @@ -297,11 +297,11 @@ function htmlData(fileDataS){ html+= ""+data.linkNum+""; html+= ""+(data.linkNum/data.allLink*100).toFixed(2)+"%"+""; html+= ""+data.packets+""; + html+= ""+data.pps+""; html+= ""+(data.packets/data.allPackets*100).toFixed(2)+"%"+""; html+= ""+(data.count/1073741824).toFixed(2)+""; - html+= ""+(data.count/data.allGByte*100).toFixed(2)+"%"+""; - html+= ""+data.pps+""; html+= ""+data.bps+""; + html+= ""+(data.count/data.allGByte*100).toFixed(2)+"%"+""; html+="" if(index==fileDataS.length-1){ html+="" @@ -309,11 +309,11 @@ function htmlData(fileDataS){ html+= ""+(data.allLink).toFixed(2)+""; html+= "" +"100%"+""; html+= ""+(data.allPackets).toFixed(2)+""; + html+= ""+"--"+""; html+= ""+"100%"+""; html+= ""+(data.allGByte/1073741824).toFixed(2)+""; + html+= ""+"--"+""; html+= ""+"100%"+""; - html+= ""+"--"+""; - html+= ""+"--"+""; html+="" } } diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 3395d5282..575ad1bef 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -95,13 +95,13 @@ + - - + @@ -419,13 +419,13 @@ function showIpActiveChart(xData,series){ html+= ""+rs.c2sByteLen+""; html+= ""+rs.s2cByteLen+""; html+= ""+byteNum+""; + html+= ""+rs.avgByte+""; html+= ""+rs.linkNum+""; html+= ""+rs.c2sPktNum+""; html+= ""+rs.s2cPktNum+""; html+= ""+packetNum+""; - html+= ""+rs.statTime+""; html+= ""+rs.avgPacket+""; - html+= ""+rs.avgByte+""; + html+= ""+rs.statTime+""; html+="" if(i==data.length-1){ @@ -435,12 +435,12 @@ function showIpActiveChart(xData,series){ html+= ""+totalc2sByte+""; html+= ""+totals2cByte+""; html+= ""+totalByte+""; + html+= ""+"--"+""; html+= ""+totalLink+""; html+= ""+totalc2sPkt+""; html+= ""+totals2cPkt+""; html+= ""+totalpacket+""; - html+= ""+"--"+""; - html+= ""+"--"+""; + html+= ""+"--"+""; html+= ""+"--"+""; html+="" } diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp index 7a21e7a38..cb79f4bd5 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp @@ -126,11 +126,11 @@ () + () + () - - @@ -365,11 +365,11 @@ function htmlData(fileDataS){ html+= ""+data.linkNum+""; html+= ""+linkper+"%"+""; html+= ""+Math.round(data.packets*100)/100+""; + html+= ""+data.pps+""; html+= ""+packper+"%"+""; html+= ""+Math.round(data.GByte*100)/100+""; - html+= ""+gbytper+"%"+""; - html+= ""+data.pps+""; html+= ""+data.bps+""; + html+= ""+gbytper+"%"+""; html+="" if(index==fileDataS.length-1){ html+="" @@ -377,11 +377,11 @@ function htmlData(fileDataS){ html+= ""+totalLink+""; html+= "" +"100%"+""; html+= ""+Math.round(totalPackets*100)/100+""; + html+= ""+"——"+""; html+= ""+"100%"+""; html+= ""+Math.round(totalGByte*100)/100+""; + html+= ""+"——"+""; html+= ""+"100%"+""; - html+= ""+"——"+""; - html+= ""+"——"+""; html+="" } } diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index 0a4e17de8..fd355eb28 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -147,11 +147,11 @@ + () + () - - @@ -397,11 +397,11 @@ html += "" + data.uniqueNum + ""; html += "" + (((data.entranceId)==1) ? "Astana":"Almaty") + ""; html += "" + Math.round(data.pktCount*100)/100 + ""; + html += "" + data.pps + ""; html += "" + packper + " %"; html += "" + Math.round(data.Gbyte*100)/100 + ""; - html += "" + gbytper + " %"; - html += "" + data.pps + ""; html += "" + data.bps + ""; + html += "" + gbytper + " %"; html += "" if(index==fileDataS.length-1){ html+="" @@ -410,11 +410,11 @@ html+= ""+totalunique+""; html+= "" +"--"+""; html+= ""+parseInt(totalPackets).toFixed(2)+""; + html+= ""+"--"+""; html+= ""+"100%"+""; html+= ""+parseInt(totalGbyte).toFixed(2)+""; + html+= ""+"--"+""; html+= ""+"100%"+""; - html+= ""+"--"+""; - html+= ""+"--"+""; html+="" } }