From 7051a8aaaf32e3c1898c32a50a96b3ec51db713a Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 25 Sep 2018 11:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E7=BD=91=E7=AB=99=E7=BB=9F=E8=AE=A1sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/TrafficHttpStatisticDao.java    |  2 +-
 .../dao/dashboard/TrafficHttpStatisticDao.xml | 20 ++++++++++---------
 .../dashboard/TrafficIpActiveStatisticDao.xml |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java
index 5d909e2..3c2ff0c 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java
@@ -13,7 +13,7 @@ public interface TrafficHttpStatisticDao {
 	
 	//获取域名分类之后属于的网站
 	List<TrafficHttpStatistic> getDomainByWebsiteList();
-	Integer preWebsiteListCount(@Param("webId") Integer webId);
+	Integer preWebsiteListCount(@Param("websiteServiceId") Integer websiteServiceId);
 	List<Map> getDomainByWebsiteServiceId(@Param("websiteServiceId") Integer websiteServiceId);
 	Map websiteDomainOthers(@Param("webIdList") List webIdList,@Param("websiteServiceId") Integer websiteServiceId);
 
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 6d37288..6722b39 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
@@ -19,28 +19,30 @@
   	SELECT SUM(link_num) count, IFNULL( website_service_id, 268435455 ) websiteServiceId ,(SUM(c2s_pkt_num)+SUM(s2c_pkt_num)) pktNum,(SUM(c2s_byte_len)+SUM(s2c_byte_len)) byteLen 
   	FROM galaxy.TRAFFIC_HTTP_STATISTIC t 
 	LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id = u.id
-	and stat_time between DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 10 MINUTE) and DATE_SUB(NOW(),INTERVAL 5 MINUTE) 
-	GROUP BY u.website_service_id ORDER BY t.link_num limit 0,10
+<!-- 	and stat_time between DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 10 MINUTE) and DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)  -->
+	and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)
+	GROUP BY u.website_service_id ORDER BY count limit 0,10
   </select> 
   <!-- 根据主题将域名分类 主题列表 最近五分钟top10-->
  <select id="getDomainByTopicList" resultType="java.util.HashMap">
   	SELECT SUM(link_num) count, IFNULL( topic_id, 268435455 ) topicId ,(SUM(c2s_pkt_num)+SUM(s2c_pkt_num)) pktNum,(SUM(c2s_byte_len)+SUM(s2c_byte_len)) byteLen 
   	FROM galaxy.TRAFFIC_HTTP_STATISTIC t 
 	LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id = u.id 
 	and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)
-	GROUP BY u.topic_id ORDER BY t.link_num limit 0,10
+	GROUP BY u.topic_id ORDER BY count limit 0,10
 	
   </select> 
 	<!--获取上个时间段该网站站域名流量的数据量  -->
   <select id="preWebsiteListCount" resultType="java.lang.Integer">
-    SELECT SUM(link_num) count FROM galaxy.traffic_http_statistic
-	WHERE web_id=#{webId}
-	and stat_time between DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 10 MINUTE) and DATE_SUB(NOW(),INTERVAL 5 MINUTE)
+    SELECT SUM(link_num) count FROM galaxy.traffic_http_statistic t 
+    LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id = u.id 
+	WHERE u.website_service_id=#{websiteServiceId}
+	and stat_time between DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 10 MINUTE) and DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)
   </select>
   
     <!--获取网站列表列表  -->
 <!--   <select id="websiteList" resultMap="BaseResultMap">
   	SELECT web_id webId, (SUM(c2s_pkt_num)+SUM(s2c_pkt_num)+SUM(c2s_byte_len)+SUM(s2c_byte_len)) count ,(SUM(c2s_pkt_num)+SUM(s2c_pkt_num)) pktNum,(SUM(c2s_byte_len)+SUM(s2c_byte_len)) byteLen FROM galaxy.traffic_http_statistic
-	WHERE web_id !=0 and stat_time >= DATE_SUB(NOW(),INTERVAL 5 MINUTE)
+	WHERE web_id !=0 and stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)
 	GROUP BY web_id ORDER BY count DESC limit 0,10
   </select> -->
   <!-- 根据网站分组获取子域名 -->
@@ -50,7 +52,7 @@
 	LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id=u.id
 	where u.website_service_id=#{websiteServiceId} 
 	and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)
-	GROUP BY t.web_id ORDER BY t.link_num limit 0,10
+	GROUP BY t.web_id ORDER BY count limit 0,10
   </select>
   <!-- 根据主题分组获取子域名 -->
   <select id="getDomainByTopicId" resultType="java.util.HashMap">
@@ -59,7 +61,7 @@
 	LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id=u.id
 	where u.topic_id=#{topicId}  
 	and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE)
-	GROUP BY t.web_id ORDER BY t.link_num limit 0,10
+	GROUP BY t.web_id ORDER BY count limit 0,10
   </select>
   
   <!-- 指定网站下的TOP10之外为others -->
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 fc311f5..57a4db1 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
@@ -27,7 +27,7 @@
   <select id="ipActiveChart" resultType="java.util.LinkedHashMap">
   	SELECT ip_addr ipAddr, SUM(link_num) linkNum ,(SUM(c2s_pkt_num)+SUM(s2c_pkt_num)) pktNum,(SUM(c2s_byte_len)+SUM(s2c_byte_len)) byteLen FROM galaxy.traffic_ip_active_statistic
 	WHERE stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_ip_active_statistic),INTERVAL 5 MINUTE)
-	GROUP BY ip_addr ORDER BY link_num DESC limit 0,10
+	GROUP BY ip_addr ORDER BY linkNum DESC limit 0,10
   </select>
   
 </mapper>
\ No newline at end of file