From 8e3270d4be63552ca3b644aba8b7087aae4405ef Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 12 Dec 2018 14:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D=E5=88=92?=
 =?UTF-8?q?=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml   | 2 +-
 .../java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml   | 2 +-
 .../com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
index aca0d7a..f610d6c 100644
--- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
@@ -71,7 +71,7 @@
   </select> -->
   <!-- 获取近一小时的带宽根据ip46，协议 tcp,udp变化  -->
 <select id="getBandwidthTrans" resultMap="BandwidthResultMap">
-	select IFNULL(SUM(c2s_byte_len+s2c_byte_len)*8/300/1024/1024/1024,0) gbps,IFNULL(SUM(c2s_pkt_num+s2c_pkt_num)/300,0) pps,IFNULL(SUM(link_num),0) linkNum, stat_time time from traffic_trans_statistic
+	select IFNULL(SUM(c2s_byte_len+s2c_byte_len)/300/1024/1024/1024,0) gbps,IFNULL(SUM(c2s_pkt_num+s2c_pkt_num)/300,0) pps,IFNULL(SUM(link_num),0) linkNum, stat_time time from traffic_trans_statistic
 	where <![CDATA[stat_time<=#{endDate} and stat_time>=#{beginDate}]]>
 	<if test="addrType != null">
 		and addr_type=#{addrType}
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
index 95a86f8..84e8aef 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
@@ -30,7 +30,7 @@
   <select id="getAppList" resultType="java.util.HashMap">
 	SELECT IFNULL(c.app_name,p.app_type) appName,p.app_type appType,p.link_num linkNum, p.packets packets, p.GByte GByte FROM (
 	SELECT app_type,SUM(link_num) AS link_num,SUM(c2s_pkt_num+s2c_pkt_num) AS packets,
-	(SUM(c2s_byte_len+s2c_byte_len)/1024/1024/1024) AS GByte 
+	(SUM(c2s_byte_len+s2c_byte_len)/300/1024/1024/1024) AS GByte 
 	FROM traffic_app_statistic WHERE
 	<if test="beginTime==null or endTime==null">
 			stat_time > DATE_SUB(#{statTime},INTERVAL 1 HOUR)
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
index 56d4760..2b21016 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
@@ -27,7 +27,7 @@
   <select id="getProtocolList" resultType="java.util.HashMap">
 	SELECT IFNULL(c.protocol_type,p.proto_type) protocolType,p.proto_type protoType,p.link_num linkNum, p.packets packets, p.GByte GByte FROM (
 	SELECT proto_type,SUM(link_num) AS link_num,SUM(c2s_pkt_num+s2c_pkt_num) AS packets,
-	 (SUM(c2s_byte_len+s2c_byte_len)/1024/1024/1024) AS GByte
+	 (SUM(c2s_byte_len+s2c_byte_len)/300/1024/1024/1024) AS GByte
 	FROM traffic_protocol_statistic WHERE 
 	<if test="beginTime==null or endTime==null">
 			stat_time > DATE_SUB(#{statTime},INTERVAL 1 HOUR)