From 7d888aeb1b8e9f52dd66036aaef964564245a555 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Sat, 29 Dec 2018 18:32:41 +0800
Subject: [PATCH] =?UTF-8?q?merged=20=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/TrafficStatisticsInfoController.java           | 5 ++---
 1 file changed, 2 insertions(+), 3 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..441a33967 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -67,7 +67,6 @@ 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;
@@ -261,7 +260,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="bandwidthTransThree")
 	@ResponseBody
-	public Map bandwidthTransThree(String beginDate,String endDate){
+	public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map map = new HashMap();
 		//String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO;
@@ -269,7 +268,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 		//String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_FOUR;
 		try {
 			url=urlAddDate(url,beginDate,endDate);
-			
+			url=url+"&searchQuotaType="+searchQuotaType;
 			String string = HttpClientUtil.get(url);
 			Gson gson = new GsonBuilder().create();
 			fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());