From 0412708c990d0339911a0543e2f2bb86336e08c4 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 11:08:50 +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=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/dao/dashboard/NtcTotalReportDao.java     | 2 +-
 src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml | 4 ++--
 .../java/com/nis/web/service/restful/DashboardService.java    | 4 ++--
 3 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 cbdf42f..77aad6a 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("statTime") Date recvTime);
+	List<Map> getNetFlowPortInfoNew(@Param("statTime") Date statTime);
 //	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 87d2ba7..5ce1cb7 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(stat_time) recvTime FROM traffic_trans_statistic
+  	SELECT MAX(stat_time) statTime FROM traffic_trans_statistic
   </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,
@@ -35,7 +35,7 @@
   </select>
   <!-- 获取上个时间段的数据 -->
 <!--  <select id="getNetFlowPortInfoOld" resultType="java.util.HashMap">
-    SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
+    SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM TRAFFIC_NETFLOW_PORT_INFO
     where RECV_TIME = DATE_SUB(#{recvTime},INTERVAL 5 MINUTE) 
   </select>-->
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/restful/DashboardService.java b/src/main/java/com/nis/web/service/restful/DashboardService.java
index 66eb199..f67d4ac 100644
--- a/src/main/java/com/nis/web/service/restful/DashboardService.java
+++ b/src/main/java/com/nis/web/service/restful/DashboardService.java
@@ -59,8 +59,8 @@ public class DashboardService extends BaseService{
 		Map maxRecvtTime = ntcTotalReportDao.getMaxRecvTime();
 		List<Map> newData = new ArrayList<Map>();
 //		List<Map> oldData = new ArrayList<Map>();
-		if(maxRecvtTime!=null&&maxRecvtTime.get("recvTime")!=null) {
-			Date recvTime = (Date) maxRecvtTime.get("recvTime");
+		if(maxRecvtTime!=null&&maxRecvtTime.get("statTime")!=null) {
+			Date recvTime = (Date) maxRecvtTime.get("statTime");
 			newData = ntcTotalReportDao.getNetFlowPortInfoNew(recvTime);
 //			oldData = ntcTotalReportDao.getNetFlowPortInfoOld(recvTime);
 		}