From b38d91c504a108adea044a32d18e83d0a3f4e3e3 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Mon, 29 Oct 2018 18:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/dao/dashboard/NtcTotalReportDao.java   | 4 ++--
 .../java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.java b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.java
index d0fbbc8..2a74919 100644
--- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.java
+++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.java
@@ -13,6 +13,6 @@ public interface NtcTotalReportDao {
 	NtcTotalReport getMaxReportTime();
 	Map getMaxRecvTime();
 	List<Map> getTotalReportList(@Param("reportTime") Date reportTime);
-	List<Map> getNetFlowPortInfoNew(@Param("reportTime") Date recvTime);
-	List<Map> getNetFlowPortInfoOld(@Param("reportTime") Date recvTime);
+	List<Map> getNetFlowPortInfoNew(@Param("recvTime") Date recvTime);
+	List<Map> getNetFlowPortInfoOld(@Param("recvTime") Date recvTime);
 }
\ No newline at end of file
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 bed1fc4..594eadf 100644
--- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
@@ -22,7 +22,7 @@
   </select>
      <!-- 获取带宽最近时间并且有效 -->
   <select id="getMaxRecvTime" resultType="java.util.HashMap">
-  	SELECT MAX(RECV_TIME) reveTime FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
+  	SELECT MAX(RECV_TIME) recvTime FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
   </select>
  <select id="getTotalReportList" resultType="java.util.HashMap">
     SELECT SUM(reject_num) rejectNum,SUM(monitor_num) monitorNum,SUM(c2s_pkt_num) c2sPktNum,SUM(s2c_pkt_num) s2cPktNum,SUM(c2s_byte_len) c2sByteLen,SUM(s2c_byte_len) s2cByteLen,SUM(new_uni_conn_num) newUniConnNum,SUM(live_conn_num) liveConnNum,
@@ -30,12 +30,12 @@
     where report_time = #{reportTime}
   </select>
  <select id="getNetFlowPortInfoNew" resultType="java.util.HashMap">
-    SELECT SUM(INOCTETS) inoctets ,SUM(OUTOCTETS) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
+    SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
     where RECV_TIME = #{recvTime}
   </select>
   <!-- 获取上个时间段的数据 -->
  <select id="getNetFlowPortInfoOld" resultType="java.util.HashMap">
-    SELECT SUM(INOCTETS) inoctets ,SUM(OUTOCTETS) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
+    SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
     where RECV_TIME = DATE_SUB(#{recvTime},INTERVAL 5 MINUTE) 
   </select>
 </mapper>
\ No newline at end of file