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

修改统计报表的数据列，以及导出忽略的列，以及ip range list查询范围

Browse Source
This commit is contained in:
zhangwei
2018-12-18 06:00:42 +06:00
parent 73eeb14ef0
commit 0d754f5949
6 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/report/ReportController.java
View File

@@ -176,7 +176,7 @@ public class ReportController extends BaseController {
params.put("searchCountry", log.getSearchCountry());
}
//查询开始IP
if (StringUtils.isNotBlank(log.getSearchStartIp())) {
if (StringUtils.isNotBlank(log.getSearchIp())) {
params.put("searchIp", log.getSearchIp());
}
//
@@ -429,7 +429,7 @@ public class ReportController extends BaseController {
+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";*/
hColumns += ",s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
+ "client_ip,server_port,client_port,deviceid,link_id,encap_type,direction,inner_smac,inner_dmac,"
+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";
+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,reportTime,";
String cfgIndexInfoNoExport = "," + hColumns;
noExportMap.put("Ntc_HTTPS_Report", cfgIndexInfoNoExport);
dataMap.put("Ntc_HTTPS_Report", list);