From ad41ff768f7703a4a2bbbd88ecbc29532af12f77 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 14 Nov 2018 18:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B8=A6=E5=AE=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/dashboard/NtcTotalReportDao.java |  4 ++--
 .../com/nis/web/dao/dashboard/NtcTotalReportDao.xml  | 10 +++++-----
 .../nis/web/service/restful/DashboardService.java    | 12 +++++-------
 3 files changed, 12 insertions(+), 14 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 2a74919..cbdf42f 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("recvTime") Date recvTime);
-	List<Map> getNetFlowPortInfoOld(@Param("recvTime") Date recvTime);
+	List<Map> getNetFlowPortInfoNew(@Param("statTime") 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 594eadf..ed61062 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) recvTime FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
+  	SELECT MAX(stat_time) recvTime FROM galaxy.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,
@@ -30,12 +30,12 @@
     where report_time = #{reportTime}
   </select>
  <select id="getNetFlowPortInfoNew" resultType="java.util.HashMap">
-    SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
-    where RECV_TIME = #{recvTime}
+    SELECT IFNULL(SUM(c2s_byte_len),0) inoctets ,IFNULL(SUM(s2c_byte_len),0) outoctets FROM galaxy.traffic_trans_statistic
+    where stat_time = #{statTime}
   </select>
   <!-- 获取上个时间段的数据 -->
- <select id="getNetFlowPortInfoOld" resultType="java.util.HashMap">
+<!--  <select id="getNetFlowPortInfoOld" resultType="java.util.HashMap">
     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>
+  </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 73a142e..66eb199 100644
--- a/src/main/java/com/nis/web/service/restful/DashboardService.java
+++ b/src/main/java/com/nis/web/service/restful/DashboardService.java
@@ -58,23 +58,21 @@ public class DashboardService extends BaseService{
 		}
 		Map maxRecvtTime = ntcTotalReportDao.getMaxRecvTime();
 		List<Map> newData = new ArrayList<Map>();
-		List<Map> oldData = new ArrayList<Map>();
+//		List<Map> oldData = new ArrayList<Map>();
 		if(maxRecvtTime!=null&&maxRecvtTime.get("recvTime")!=null) {
 			Date recvTime = (Date) maxRecvtTime.get("recvTime");
 			newData = ntcTotalReportDao.getNetFlowPortInfoNew(recvTime);
-			oldData = ntcTotalReportDao.getNetFlowPortInfoOld(recvTime);
+//			oldData = ntcTotalReportDao.getNetFlowPortInfoOld(recvTime);
 		}
 		//统计带宽的流入流出 单位 五分钟 的 byte
 		Double inoctets=0d;
 		Double outoctets=0d;
-		if(newData!=null&&newData.size()>0&&oldData!=null&&oldData.size()>0&&newData.get(0)!=null&&oldData.get(0)!=null){
+		if(newData!=null&&newData.size()>0&&newData.get(0)!=null){
 			Double newInoctets=Double.parseDouble(newData.get(0).get("inoctets").toString()) ;
 			Double newOutoctets=Double.parseDouble(newData.get(0).get("outoctets").toString()) ;
-			Double oldInoctets=Double.parseDouble(oldData.get(0).get("inoctets").toString());
-			Double oldOutoctets=Double.parseDouble(oldData.get(0).get("outoctets").toString());
 			//结果为当前五分钟减去上个五分钟
-			inoctets=newInoctets-oldInoctets;
-			outoctets=newOutoctets-oldOutoctets;
+			inoctets=newInoctets;
+			outoctets=newOutoctets;
 			if(inoctets<0||outoctets<0){
 				inoctets=0d;
 				outoctets=0d;