From 8e8b519167a1886c1e5dbb6f22d26ba649b32192 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Sat, 1 Dec 2018 14:10:59 +0800
Subject: [PATCH] =?UTF-8?q?app=20,http=E7=BD=91=E7=AB=99=EF=BC=8C=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83IP=EF=BC=8C=E5=8D=8F=E8=AE=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=8Cua=E6=B5=8F=E8=A7=88=E5=99=A8=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20=E6=94=B9=E4=B8=BAbytes=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/dashboard/TrafficAppStatisticDao.xml |  2 +-
 .../dao/dashboard/TrafficHttpStatisticDao.xml    | 12 ++++++------
 .../dashboard/TrafficIpActiveStatisticDao.xml    |  2 +-
 .../dashboard/TrafficProtocolStatisticDao.xml    |  2 +-
 .../web/dao/dashboard/TrafficUaStatisticDao.xml  | 16 ++++++++--------
 5 files changed, 17 insertions(+), 17 deletions(-)

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 16f87af..f723bf4 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
@@ -20,7 +20,7 @@
   	SELECT MAX(stat_time) statTime FROM traffic_app_statistic WHERE app_type != 0
   </select>
  <select id="appChart" resultType="java.util.HashMap">
-    SELECT app_type appType, SUM(link_num) count FROM traffic_app_statistic
+    SELECT app_type appType, SUM(c2s_byte_len+s2c_byte_len) count FROM traffic_app_statistic
 	WHERE app_type !=0 and stat_time = #{statTime}
 	GROUP BY app_type order by count desc limit 0,10
   </select>
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
index 5efa0cf..650768e 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
@@ -20,7 +20,7 @@
   	SELECT MAX(stat_time) statTime FROM traffic_http_statistic WHERE web_id != 0
   </select>
   <!-- 根据服务网站将域名分类 网站列表-->
  <select id="getDomainByWebsiteList" resultType="com.nis.domain.restful.dashboard.TrafficHttpStatistic">
-  	SELECT SUM(link_num) count, IFNULL( website_service_id, 268435455 ) websiteServiceId  
+  	SELECT SUM(c2s_byte_len+s2c_byte_len) count, IFNULL( website_service_id, 268435455 ) websiteServiceId  
   	FROM TRAFFIC_HTTP_STATISTIC t 
 	LEFT JOIN ui_website_domain_topic u ON t.web_id = u.id
 	where t.web_id!=0
@@ -28,7 +28,7 @@
 	GROUP BY u.website_service_id ORDER BY count desc limit 0,10
   </select> 
   <!-- 根据主题将域名分类 主题列表 最近五分钟top10-->
  <select id="getDomainByTopicList" resultType="java.util.HashMap">
-  	SELECT SUM(link_num) count, IFNULL( topic_id, 268435455 ) topicId  
+  	SELECT SUM(c2s_byte_len+s2c_byte_len) count, IFNULL( topic_id, 268435455 ) topicId  
   	FROM TRAFFIC_HTTP_STATISTIC t 
 	LEFT JOIN ui_website_domain_topic u ON t.web_id = u.id 
 	where t.web_id!=0
@@ -38,7 +38,7 @@
   </select> 
 	<!--获取上个时间段该网站站域名流量的数据量  -->
   <select id="preWebsiteListCount" resultType="java.lang.Integer">
-    SELECT SUM(link_num) count FROM traffic_http_statistic t 
+    SELECT SUM(c2s_byte_len+s2c_byte_len) count FROM traffic_http_statistic t 
     LEFT JOIN ui_website_domain_topic u ON t.web_id = u.id 
 	WHERE u.website_service_id=#{websiteServiceId}
 	and stat_time = DATE_SUB(#{statTime},INTERVAL 5 MINUTE)
@@ -52,7 +52,7 @@
   </select> -->
   <!-- 根据网站分组获取子域名 -->
   <select id="getDomainByWebsiteServiceId" resultType="java.util.HashMap">
-	SELECT web_id webId,SUM(link_num) count 
+	SELECT web_id webId,SUM(c2s_byte_len+s2c_byte_len) count 
 	FROM traffic_http_statistic t
 	LEFT JOIN ui_website_domain_topic u ON t.web_id=u.id
 	where u.website_service_id=#{websiteServiceId} 
@@ -61,7 +61,7 @@
   </select>
   <!-- 根据主题分组获取子域名 -->
   <select id="getDomainByTopicId" resultType="java.util.HashMap">
-	SELECT web_id webId,SUM(link_num) count 
+	SELECT web_id webId,SUM(c2s_byte_len+s2c_byte_len) count 
 	FROM traffic_http_statistic t
 	LEFT JOIN ui_website_domain_topic u ON t.web_id=u.id
 	where u.topic_id=#{topicId}  
@@ -71,7 +71,7 @@
   
   <!-- 指定网站下的TOP10之外为others -->
     <select id="websiteDomainOthers" resultType="java.util.HashMap">
-  	SELECT SUM(link_num) count  FROM traffic_http_statistic t
+  	SELECT SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_http_statistic t
   	LEFT JOIN ui_website_domain_topic u ON t.web_id=u.id
 	where u.website_service_id=#{websiteServiceId} 
 	and t.web_id!=0
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
index 89baf4d..0989949 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
@@ -28,7 +28,7 @@
   </select>
     <!-- IP流量统计五分钟-->
   <select id="ipActiveChart" resultType="java.util.LinkedHashMap">
-  	SELECT ip_addr ipAddr, SUM(link_num) linkNum FROM traffic_ip_active_statistic
+  	SELECT ip_addr ipAddr, SUM(c2s_byte_len+s2c_byte_len) linkNum FROM traffic_ip_active_statistic
 	WHERE stat_time = #{statTime}
 	GROUP BY ip_addr ORDER BY linkNum DESC limit 0,10
   </select>
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 2018481..2a90c0f 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
@@ -20,7 +20,7 @@
 	SELECT MAX(stat_time) statTime FROM traffic_protocol_statistic WHERE proto_type != 0
   </select>
   <select id="protocolChart" resultType="java.util.HashMap">
-	SELECT proto_type protoType, SUM(link_num) count FROM traffic_protocol_statistic WHERE proto_type != 0 
+	SELECT proto_type protoType, SUM(c2s_byte_len+s2c_byte_len) count FROM traffic_protocol_statistic WHERE proto_type != 0 
 	AND stat_time = #{statTime} GROUP BY proto_type ORDER BY count DESC LIMIT 0, 10
   </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml
index baf3f6e..b53c9fd 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml
@@ -22,25 +22,25 @@
   </select>
   <!--获取操作系统列表TOP10  -->
   <select id="systemList" resultMap="BaseResultMap">
-    SELECT os_type osType, SUM(link_num) count  FROM traffic_ua_statistic
+    SELECT os_type osType, SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_ua_statistic
 	WHERE os_type !=0 and stat_time = #{statTime}
 	GROUP BY os_type ORDER BY count DESC limit 0,10
   </select>
   <!--获取上个时间段操作系统的数据量  -->
   <select id="preSystemListCount" resultType="java.lang.Integer">
-    SELECT SUM(link_num) count FROM traffic_ua_statistic
+    SELECT SUM(c2s_byte_len+s2c_byte_len) count FROM traffic_ua_statistic
 	WHERE os_type !=0 and os_type=#{osType}
 	and stat_time = DATE_SUB(#{statTime},INTERVAL 5 MINUTE)
   </select>
   <!-- 根据操作系统获取浏览器分类 -->
   <select id="getBrowserBySystem" resultType="java.util.HashMap">
-    SELECT bs_type bsType, SUM(link_num) count  FROM traffic_ua_statistic
+    SELECT bs_type bsType, SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_ua_statistic
 	WHERE bs_type !=0 and os_type=#{osType} and stat_time = #{statTime}
 	GROUP BY bs_type ORDER BY count DESC limit 0,10
   </select>
     <!--浏览器TOP10后所有为others -->
   <select id="systemOthers" resultType="java.util.HashMap">
-  	SELECT SUM(link_num) count  FROM traffic_ua_statistic
+  	SELECT SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_ua_statistic
 	WHERE bs_type !=0 and os_type=#{osType}
 		<if test="bsType!=null and bsType.size()>0">
 		and bs_type not in
@@ -53,25 +53,25 @@
   
   <!--获取浏览器列表TOP10  -->
   <select id="browserList" resultMap="BaseResultMap">
-    SELECT bs_type bsType, SUM(link_num) count  FROM traffic_ua_statistic
+    SELECT bs_type bsType, SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_ua_statistic
 	WHERE bs_type !=0 and stat_time = #{statTime}
 	GROUP BY bs_type ORDER BY count DESC limit 0,10
   </select>
     <!--获取上个时间段浏览器的数据量  -->
   <select id="preBrowserListCount" resultType="java.lang.Integer">
-    SELECT SUM(link_num) count FROM traffic_ua_statistic
+    SELECT SUM(c2s_byte_len+s2c_byte_len) count FROM traffic_ua_statistic
 	WHERE bs_type !=0 and bs_type=#{bsType}
 	and stat_time = DATE_SUB(#{statTime},INTERVAL 5 MINUTE)
   </select>
   <!-- 根据浏览器获取操作系统分类 -->
   <select id="getSystemBybrowser" resultType="java.util.HashMap">
-    SELECT os_type osType, SUM(link_num) count  FROM traffic_ua_statistic
+    SELECT os_type osType, SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_ua_statistic
 	WHERE os_type !=0 and bs_type=#{bsType} and stat_time = #{statTime}
 	GROUP BY os_type ORDER BY count DESC limit 0,10
   </select>
   <!--操作系统TOP10后所有为others -->
   <select id="browserOthers" parameterType="java.util.List" resultType="java.util.HashMap">
-  	SELECT SUM(link_num) count  FROM traffic_ua_statistic
+  	SELECT SUM(c2s_byte_len+s2c_byte_len) count  FROM traffic_ua_statistic
 	WHERE os_type !=0 and bs_type=#{bsType}
 		<if test="osType!=null and osType.size()>0">
 		and os_type not in