From 486b3fb63cb832eb9c8422888e8adec8d291783a Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@iie.ac.cn>
Date: Sat, 29 Dec 2018 12:40:37 +0600
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9ntc=5Fradius=5Freport?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=ADnasip=E4=B8=BAframe=5Fip=202:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9ntc=5Ftotal=5Freport=E8=A1=A8=E4=B8=ADlive=5Fconn=5Fnu?=
 =?UTF-8?q?m=E4=B8=BAclose=5Fconn=5Fnum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/TrafficReportDao.xml   | 12 ++++++------
 .../com/nis/web/dao/dashboard/NtcTotalReportDao.xml  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/TrafficReportDao.xml b/src/main/java/com/nis/web/dao/TrafficReportDao.xml
index 02c0d25..2934f1a 100644
--- a/src/main/java/com/nis/web/dao/TrafficReportDao.xml
+++ b/src/main/java/com/nis/web/dao/TrafficReportDao.xml
@@ -82,7 +82,7 @@
 	<resultMap id="NtcRadiusReportMap"
 		type="com.nis.domain.restful.NtcRadiusReport">
 		<result column="account" jdbcType="VARCHAR" property="account" />
-		<result column="nas_ip" jdbcType="VARCHAR" property="nasIp" />
+		<result column="frame_ip" jdbcType="VARCHAR" property="nasIp" />
 		<result column="sum" jdbcType="BIGINT" property="sum" />
 		<result column="report_time" jdbcType="TIMESTAMP"
 			property="reportTime" />
@@ -786,7 +786,7 @@
 	<select id="findNasIpList"
 		parameterType="com.nis.domain.restful.NtcRadiusReport"
 		resultMap="NtcRadiusReportMap">
-		select nas_ip,sum(num) num from ntc_radius_report
+		select frame_ip,sum(num) num from ntc_radius_report
 		<where>
 			<choose>
 				<when
@@ -800,7 +800,7 @@
 			</choose>
 
 		</where>
-		group by nas_ip order by num desc
+		group by frame_ip order by num desc
 	</select>
 	<select id="findAccounList"
 		parameterType="com.nis.domain.restful.NtcRadiusReport"
@@ -826,7 +826,7 @@
 		parameterType="com.nis.domain.restful.NtcRadiusReport"
 		resultMap="NtcRadiusReportMap">
 		SELECT
-		*
+		frame_ip,num,account,report_time
 		FROM ntc_radius_report
 		<where>
 			<if
@@ -835,7 +835,7 @@
 			</if>
 			<if
 				test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 and searchNasIp != null and searchNasIp !=''">
-				<![CDATA[AND nas_ip =#{searchNasIp}]]>
+				<![CDATA[AND frame_ip =#{searchNasIp}]]>
 			</if>
 			<choose>
 				<when
@@ -931,7 +931,7 @@
  
   <!-- 根据最近的时间获取阻断，监测等流量信息 -->
  <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,
+    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(close_conn_num) closeConnNum,
     SUM(drop_conn_num) dropConnNum,SUM(loop_conn_num) loopConnNum FROM ntc_total_report
     where report_time  > DATE_SUB(#{reportTime},INTERVAL 1 hour)
   </select>
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 82975d0..bf0cd84 100644
--- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
@@ -21,7 +21,7 @@
  
   <!-- 根据最近的时间获取阻断，监测等流量信息 -->
  <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,
+    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(close_conn_num) closeConnNum,
     SUM(drop_conn_num) dropConnNum,SUM(loop_conn_num) loopConnNum FROM ntc_total_report
     where report_time  > DATE_SUB(#{reportTime},INTERVAL 1 hour)
   </select>
@@ -145,7 +145,7 @@
     			new_uni_conn_num
     		</when>
     		<when test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 4 ">
-    			live_conn_num
+    			close_conn_num
     		</when>
     		<when test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 5 ">
     			(new_uni_conn_num-reject_num)