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

新增流量统计app趋势动态界面，修改导出csv俄文office打开乱码问题

Browse Source
This commit is contained in:
zhanghongqing
2019-01-06 20:00:13 +08:00
parent 107d9b295f
commit 9559f7e9f3
12 changed files with 906 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,6 +427,85 @@ public class TrafficStatisticsInfoController extends BaseController {
}
return list;
}
/**
* App趋势界面 独立IP访问数量趋势图
*/
@RequestMapping(value="appTrendList")
public String appTrendList(Model model,String beginDate,String endDate,String appName,Integer appType){
if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
endDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 2);
beginDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
}
model.addAttribute("appName", appName);
model.addAttribute("appType", appType);
model.addAttribute("beginDate", beginDate);
model.addAttribute("endDate", endDate);
return "/dashboard/trafficAppTrendList";
}
@RequestMapping("ajaxAppTrend")
@ResponseBody
public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,Model model){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map list = new HashMap();
try {
String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_TREND;
URIBuilder uriBuilder = new URIBuilder(url);
uriBuilder.addParameter("searchStartTime",beginDate);
uriBuilder.addParameter("searchEndTime",endDate);
url=uriBuilder.toString();
if(appType!=null){
url=url+"&searchAppId="+appType;
}
if(entranceId!=null){
url=url+"&searchEntranceId="+entranceId;
}
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map<String, Object>>(){}.getType());
logger.debug("app趋势图"+fromJsonList);
list = (Map) fromJsonList.get("data");
} catch (Exception e) {
e.printStackTrace();
logger.error("app趋势图数据获取错误"+e);
list.put("error","request_service_failed");
}
return list;
}
@RequestMapping("ajaxAppTopList")
@ResponseBody
public List ajaxAppTopList(String beginDate,String endDate,Integer appType,Integer entranceId,Model model){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
try {
String url=Constants.DASHBOARD_URL+Constants.APPCONN_RECORD_TOP100;
URIBuilder uriBuilder = new URIBuilder(url);
uriBuilder.addParameter("searchStartTime",beginDate);
uriBuilder.addParameter("searchEndTime",endDate);
url=uriBuilder.toString();
if(appType!=null){
url=url+"&searchAppId="+appType;
}
if(entranceId!=null){
url=url+"&searchEntranceId="+entranceId;
}
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map<String, Object>>(){}.getType());
logger.debug("app列表Top100"+fromJsonList);
list = (ArrayList) fromJsonList.get("data");
} catch (Exception e) {
e.printStackTrace();
logger.error("app列表Top100"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
}
return list;
}
/**
* 网址类型列表
*/
@@ -470,12 +549,12 @@ public class TrafficStatisticsInfoController extends BaseController {
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map<String, Object>>(){}.getType());
logger.debug("活跃IP1小时"+fromJsonList);
logger.debug("活跃域名1小时"+fromJsonList);
list = (ArrayList) fromJsonList.get("data");
} catch (Exception e) {
e.printStackTrace();
logger.error("活跃IP数据获取错误"+e);
logger.error("活跃域名数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
}
return list;