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

流量统计app详情趋势统计图增加Gbps、PPS单位切换统计，导出图片增加标题与时间

Browse Source 
Conflicts:
	src/main/resources/nis.properties
This commit is contained in:
zhanghongqing
2019-02-22 11:08:58 +08:00
committed by 段冬梅
parent d8a5ecf8ab
commit ba3aeb199f
4 changed files with 1172 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/util/Constants.java
View File

@@ -719,6 +719,9 @@ public final class Constants {
public static final String TREND_TOTAL_REPORT=Configurations.getStringProperty("trendTotalReport","trendTotalReport");
public static final String TRAFFIC_APP_TREND=Configurations.getStringProperty("trafficAppTrend","trafficAppTrend");
public static final String APPCONN_RECORD_TOP100=Configurations.getStringProperty("appConnRecordTop100","appConnRecordTop100");
public static final String TRAFFIC_APP_PPS_TREND=Configurations.getStringProperty("trafficAppPpsTrend","trafficAppPpsTrend");
public static final String TRAFFIC_APP_BPS_TREND=Configurations.getStringProperty("trafficAppBpsTrend","trafficAppBpsTrend");
/**
* httpclient 工具超时时间设置
*/

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

@@ -481,11 +481,20 @@ public class TrafficStatisticsInfoController extends BaseController {
}
@RequestMapping("ajaxAppTrend")
@ResponseBody
public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,Integer[] searchIspCode,Model model){
public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map list = new HashMap();
try {
String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_TREND;
//TRAFFIC_APP_PPS_TREND
String trafficApp=Constants.TRAFFIC_APP_TREND;
if("Unique Ip".equals(searchQuotaType)){
trafficApp=Constants.TRAFFIC_APP_TREND;
}else if("Gbps".equals(searchQuotaType)){
trafficApp=Constants.TRAFFIC_APP_BPS_TREND;
}else if("pps".equals(searchQuotaType)){
trafficApp=Constants.TRAFFIC_APP_PPS_TREND;
}
String url=Constants.DASHBOARD_URL+trafficApp;
URIBuilder uriBuilder = new URIBuilder(url);
uriBuilder.addParameter("searchStartTime",beginDate);
uriBuilder.addParameter("searchEndTime",endDate);