From 8cfc65f98c023bc7e74b4c817de304df8686f59e Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Sat, 29 Dec 2018 15:25:59 +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=E7=9A=84=E5=85=B3=E9=97=AD=E8=BF=9E=E6=8E=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E8=B7=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrafficStatisticsInfoController.java         |  9 ++++-----
 .../WEB-INF/views/dashboard/dashBoardIndex.jsp   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
index 9075b7b30..27a4d3595 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -67,12 +67,11 @@ public class TrafficStatisticsInfoController extends BaseController {
 		HashMap<String, Object> m = new HashMap<String, Object>();
 		List list = new ArrayList();
 		try {
-			Random r = new Random();
 			Double rejectNum=0d;
 			Double dropConnNum=0d;
 			Double monitorNum=0d;
 			Double loopConnNum=0d;
-			Double liveConnNum=0d;
+			Double closeConnNum=0d;
 			Double newUniConnNum=0d;
 			Double inoctetsNum=0d;
 			Double outoctetsNum=0d;
@@ -87,7 +86,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 				monitorNum = (Double) map.get("monitorNum");
 				dropConnNum =  (Double) map.get("dropConnNum");
 				loopConnNum = (Double) map.get("loopConnNum");
-				liveConnNum = (Double) map.get("liveConnNum");
+				closeConnNum = (Double) map.get("closeConnNum");
 				newUniConnNum = (Double) map.get("newUniConnNum");
 				inoctetsNum = (Double) map.get("inoctets");
 				outoctetsNum = (Double) map.get("outoctets");
@@ -101,7 +100,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			m.put("monitorNum", monitorNum);
 			m.put("loopConnNum", loopConnNum);
 			m.put("dropConnNum", dropConnNum);
-			m.put("liveConnNum", liveConnNum);
+			m.put("closeConnNum", closeConnNum);
 			m.put("newUniConnNum", newUniConnNum);
 			
 			m.put("bandwidth", bandwidth);
@@ -682,7 +681,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 				if("new_link".equals(searchAction)){
 					url=url+"&searchBusinessType="+3;
 				}
-				if("active_link".equals(searchAction)){
+				if("close_link".equals(searchAction)){
 					url=url+"&searchBusinessType="+4;
 				}
 				if("pass".equals(searchAction)){
diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index a2c656c0d..490fb8f68 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -139,13 +139,13 @@ body {
                 </div>
                  <div class="fr_fc">
                 	<div class="fl_visual">
-                		<a href="${ctx}/dashboard/traffic/ntcTotalReportDetail?searchAction=active_link"><i class="fa fa-unlink"> </i></a>
+                		<a href="${ctx}/dashboard/traffic/ntcTotalReportDetail?searchAction=close_link"><i class="fa fa-unlink"> </i></a>
                 	 </div>
                     <div class="fl_fc">
                         <p data-original-title="<spring:message code="active_link"/>" 
                          class="tooltips" data-flag="false" data-html="true" data-placement="top">
 							<!-- 活跃链接数 --><spring:message code="active_link"/></p>
-                        <a href="${ctx}/dashboard/traffic/ntcTotalReportDetail?searchAction=active_link"><p class="numberRun6">0</p></a>
+                        <a href="${ctx}/dashboard/traffic/ntcTotalReportDetail?searchAction=close_link"><p class="numberRun6">0</p></a>
                     
                     </div>
                 </div>
@@ -424,7 +424,7 @@ function ajaxinfo(){
 			var monitorNum =data.monitorNum;
 			var dropConnNum =data.dropConnNum;
 			var newUniConnNum=data.newUniConnNum;
-			var liveConnNum=data.liveConnNum;
+			var closeConnNum=data.closeConnNum;
 			
 			if(loopConnNum==null||loopConnNum==""){
 				loopConnNum=0;
@@ -441,17 +441,17 @@ function ajaxinfo(){
 			if(newUniConnNum==null||newUniConnNum==""){
 				newUniConnNum=0;
 			}
-			if(liveConnNum==null||liveConnNum==""){
-				liveConnNum=0;
+			if(closeConnNum==null||closeConnNum==""){
+				closeConnNum=0;
 			}
 			dataScroll(".numberRun",Math.round(loopConnNum));
 			dataScroll(".numberRun1",Math.round(rejectNum));
 			dataScroll(".numberRun2",Math.round(monitorNum));
 			dataScroll(".numberRun3",Math.round(dropConnNum));
 			dataScroll(".numberRun5",Math.round(newUniConnNum));
-			dataScroll(".numberRun6",Math.round(liveConnNum));
-			dataScroll(".numberRun7",Math.round(newUniConnNum-rejectNum));
-			dataScroll(".numberRun8",Math.round(newUniConnNum-rejectNum-dropConnNum));
+			dataScroll(".numberRun6",Math.round(closeConnNum));
+			dataScroll(".numberRun7",Math.round(newUniConnNum+closeConnNum-rejectNum));
+			dataScroll(".numberRun8",Math.round(newUniConnNum-rejectNum));
 			
 			//计算带宽进出口流量百分比