From 1f4618ae7fe2552618ccdfc1d92ed2fd2d9c6f7f Mon Sep 17 00:00:00 2001 From: tanghao Date: Wed, 23 Jan 2019 10:08:09 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E9=87=8FB=E5=92=8Cb?= =?UTF-8?q?=E6=8D=A2=E7=AE=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3cd969978e696954d887c587762711fabb1b52ef) --- .../web/controller/dashboard/DashboardController.java | 2 +- .../dashboard/TrafficStatisticsInfoController.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 239669b2c..c37c0c380 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -268,7 +268,7 @@ public class DashboardController extends BaseController{ //两个时间段之间的秒数 double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate)); for(TrafficIpActiveStatistic data:list) { - data.setAvgByte(f.format(Long.parseLong(data.get_byte())/1024/1024/1024/allSeconds)); + data.setAvgByte(f.format(Long.parseLong(data.get_byte())*8/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 c643b11a2..45804829d 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -352,7 +352,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())/allSeconds; + double avgByte=Double.parseDouble(m.get("GByte").toString())*8/allSeconds; m.put("bps",f.format(avgByte)); totalLink+=Long.parseLong( m.get("linkNum").toString()); totalPackets+=Long.parseLong(m.get("packets").toString()); @@ -442,7 +442,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())/allSeconds; + double avgByte=Double.parseDouble(m.get("GByte").toString())*8/allSeconds; m.put("bps",f.format(avgByte)); } for (Object object : list) { @@ -553,7 +553,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())/1024/1024/1024/allSeconds; + double avgByte=Double.parseDouble(m.get("byteNum").toString())*8/1024/1024/1024/allSeconds; m.put("bps",f.format(avgByte)); } } @@ -673,7 +673,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())/1024/1024/1024/allSeconds; + double avgByte=Double.parseDouble(m.get("byteCount").toString())*8/1024/1024/1024/allSeconds; m.put("bps",f.format(avgByte)); } List codeList = appCfgService.getDomainDict(new WebsiteDomainTopic()); @@ -756,7 +756,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())/1024/1024/1024/allSeconds; + double avgByte=Double.parseDouble(m.get("count").toString())*8/1024/1024/1024/allSeconds; m.put("bps",f.format(avgByte)); m.remove("domainData"); Double value1=0d;