gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 合并冲突

Browse Source
This commit is contained in:
tanghao
2018-12-29 18:32:41 +08:00
parent f4acc8f063
commit 7d888aeb1b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -67,7 +67,6 @@ public class TrafficStatisticsInfoController extends BaseController {
HashMap<String, Object> m = new HashMap<String, Object>(); HashMap<String, Object> m = new HashMap<String, Object>();
List list = new ArrayList(); List list = new ArrayList();
try { try {
Random r = new Random();
Double rejectNum=0d; Double rejectNum=0d;
Double dropConnNum=0d; Double dropConnNum=0d;
Double monitorNum=0d; Double monitorNum=0d;
@@ -261,7 +260,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/ */
@RequestMapping(value="bandwidthTransThree") @RequestMapping(value="bandwidthTransThree")
@ResponseBody @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<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap(); Map map = new HashMap();
//String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO; //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; //String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_FOUR;
try { try {
url=urlAddDate(url,beginDate,endDate); url=urlAddDate(url,beginDate,endDate);
url=url+"&searchQuotaType="+searchQuotaType;
String string = HttpClientUtil.get(url); String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType()); fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());