Merge branch 'develop' of https://git.mesalab.cn/galaxy/galaxy-push-service- into develop

2 files changed, 18 insertions, 1 deletions

diff --git a/src/main/resources/mybatis/mapper/MonitorMapper.xml b/src/main/resources/mybatis/mapper/MonitorMapper.xml
index 3c192b9..052a579 100644
--- a/src/main/resources/mybatis/mapper/MonitorMapper.xml
+++ b/src/main/resources/mybatis/mapper/MonitorMapper.xml
@@ -27,8 +27,11 @@
         </collection>
     </resultMap>
     <!--网络流量监控_5min-->
+
+
     <select id="getNetWaterMonitor" resultType="com.nis.galaxy.domain.NetWaterMonitor">
         <![CDATA[
+
         SELECT ifnull(d.entrance_id,0) AS area,'INOCTETS' AS type,SUM(tt.incount) AS count,time
         FROM
             (SELECT IF((b.INOCTETS - a.INOCTETS ) >0  ,b.INOCTETS - a.INOCTETS ,b.INOCTETS) AS incount,b.ip2 AS ip,#{push} AS time
@@ -77,6 +80,8 @@
 	 ) d
 	ON d.manager_ip = tt.ip
     GROUP BY area
+
+
         ]]>
     </select>
     <!--时间:网络流量监控_5min-->
diff --git a/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml b/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml
index bd139d1..3a0e4fc 100644
--- a/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml
+++ b/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml
@@ -19,7 +19,7 @@
         ]]>
     </select>
     <!--互联网流量TOP10-->
-    <select id="getNetFlowWaterTop10" resultType="com.nis.galaxy.domain.NetFlowWater">
+    <select id="getNetFlowWaterTop10_old" resultType="com.nis.galaxy.domain.NetFlowWater">
         <![CDATA[
         SELECT ifnull(dic.area,0) AS area,net.time AS time,sum(net.count)/1024/1024 AS count
         FROM (
@@ -34,6 +34,18 @@
         GROUP BY area,time
         ]]>
     </select>
+
+
+    <select id="getNetFlowWaterTop10" resultType="com.nis.galaxy.domain.NetFlowWater">
+        <![CDATA[
+
+        select entrance_id as area ,stat_time as time, IFNULL(SUM(c2s_byte_len+s2c_byte_len),0)/1024/1024 as count
+        from traffic_trans_statistic where STAT_TIME>= #{start} and STAT_TIME<#{end}
+        group by stat_time,entrance_id
+
+
+        ]]>
+    </select>
     <!--1小时互联网流量TOP10-->
     <select id="getNetflow1HourWaterflowTop10" resultType="com.nis.galaxy.domain.NetFlowWater" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=") UNION ALL (">