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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/main/resources/mybatis/mapper/EventsMapper.xml b/src/main/resources/mybatis/mapper/EventsMapper.xml
index 55123f0..3eb7e2c 100644
--- a/src/main/resources/mybatis/mapper/EventsMapper.xml
+++ b/src/main/resources/mybatis/mapper/EventsMapper.xml
@@ -272,7 +272,7 @@
 			 sum(case t.service when 129 then t.sum else 0 end) as httpNum ,
 			 sum(case t.service when 132 then t.sum else 0 end) as mailNum ,
 			 sum(case t.service when  389  then t.sum else 0 end) + sum(case t.service when 390 then t.sum else 0 end) + sum(case t.service when 391 then t.sum else 0 end) + sum(case t.service when 392 then t.sum else 0 end)  as vedioNum ,
-			 sum(case t.service when 592 then t.sum else 0 end) as agentNum
+			  sum(case t.service when 131 then t.sum else 0 end)  + sum(case t.service when 592 then t.sum else 0 end) as agentNum
 			 from (
 		              SELECT  service, sum(sum) AS sum
                         FROM ntc_pz_report
@@ -280,7 +280,7 @@
                         AND report_time < #{end}
                         AND cfg_id in (
 											select compile_id from ui_cfg_num_statistics  where cfg_state=1 and
-												service_id in (128, 129, 132, 389, 390, 391, 392, 592)
+												service_id in (128, 129, 131, 132, 389, 390, 391, 392, 592)
 											)
 				      GROUP BY service	) t
 
@@ -331,7 +331,7 @@
 			 sum(case t.service when 17 then t.sum else 0 end) as httpNum ,
 			 sum(case t.service when 20 then t.sum else 0 end) as mailNum ,
 			 sum(case t.service when  261  then t.sum else 0 end) + sum(case t.service when 262 then t.sum else 0 end) + sum(case t.service when 263 then t.sum else 0 end) + sum(case t.service when 264 then t.sum else 0 end)  as vedioNum ,
-			 sum(case t.service when 576 then t.sum else 0 end) as agentNum
+			 sum(case t.service when 19 then t.sum else 0 end) + sum(case t.service when 576 then t.sum else 0 end) as agentNum
 			 from (
 		              SELECT  service, sum(sum) AS sum
                         FROM ntc_pz_report
@@ -339,7 +339,7 @@
                         AND report_time < #{end}
                         AND cfg_id in (
 											select compile_id from ui_cfg_num_statistics  where cfg_state=1 and
-												service_id in (16, 17, 20, 261, 262, 263, 264,576)
+												service_id in (16, 17,19,20, 261, 262, 263, 264,576)
 											)
 				      GROUP BY service	) t
 			 GROUP BY event;
diff --git a/src/main/resources/mybatis/mapper/MonitorMapper.xml b/src/main/resources/mybatis/mapper/MonitorMapper.xml
index c8b125d..de9d035 100644
--- a/src/main/resources/mybatis/mapper/MonitorMapper.xml
+++ b/src/main/resources/mybatis/mapper/MonitorMapper.xml
@@ -32,7 +32,7 @@
 
             SELECT entrance_id AS area,'OUT' AS type,ifnull(sum(c2s_byte_len + s2c_byte_len),0) AS count,#{push} AS time
         FROM traffic_trans_statistic
-        where stat_time=(SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY  stat_time DESC LIMIT 0,1 )  and entrance_id=1
+        where stat_time=(SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY  stat_time DESC LIMIT 1,1 )  and entrance_id=1
           and direction=0
         group by area
 
@@ -40,7 +40,7 @@
 
 			SELECT entrance_id AS area,'OUT' AS type,ifnull(sum(c2s_byte_len + s2c_byte_len),0) AS count,#{push} AS time
         FROM traffic_trans_statistic
-        where stat_time=(SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY  stat_time DESC LIMIT 0,1 )  and entrance_id=2
+        where stat_time=(SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY  stat_time DESC LIMIT 1,1 )  and entrance_id=2
            and direction=0
         group by area
 
@@ -48,7 +48,7 @@
 
 			 SELECT entrance_id AS area,'IN' AS type,ifnull(sum(c2s_byte_len + s2c_byte_len),0) AS count,#{push} AS time
         FROM traffic_trans_statistic
-        where stat_time=(SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY  stat_time DESC LIMIT 0,1) and entrance_id=1
+        where stat_time=(SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY  stat_time DESC LIMIT 1,1) and entrance_id=1
            and direction=1
         group by area
 
@@ -56,7 +56,7 @@
 
 			 SELECT entrance_id AS area,'IN' AS type,ifnull(sum(c2s_byte_len + s2c_byte_len),0) AS count,#{push} AS time
         FROM traffic_trans_statistic
-        where stat_time=(SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE) ORDER BY stat_time DESC LIMIT 0,1) and entrance_id=2
+        where stat_time=(SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE) ORDER BY stat_time DESC LIMIT 1,1) and entrance_id=2
          and direction=1
         group by area