ANS\HTTPS report界面调整提交
This commit is contained in:
@@ -11,8 +11,21 @@ public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
|
|||||||
protected String bps;
|
protected String bps;
|
||||||
@ExcelField(title="pps",sort=9)
|
@ExcelField(title="pps",sort=9)
|
||||||
protected String pps;
|
protected String pps;
|
||||||
|
@ExcelField(title="asn",sort=10)
|
||||||
|
protected String asn;
|
||||||
|
public String getAsn() {
|
||||||
|
return asn;
|
||||||
|
}
|
||||||
|
public void setAsn(String asn) {
|
||||||
|
this.asn = asn;
|
||||||
|
}
|
||||||
|
public String getSearchAsnType() {
|
||||||
|
return searchAsnType;
|
||||||
|
}
|
||||||
|
public void setSearchAsnType(String searchAsnType) {
|
||||||
|
this.searchAsnType = searchAsnType;
|
||||||
|
}
|
||||||
|
protected String searchAsnType;//1:d_asn;2:s_asn
|
||||||
|
|
||||||
public String getBps() {
|
public String getBps() {
|
||||||
return bps;
|
return bps;
|
||||||
|
|||||||
@@ -1,17 +1,25 @@
|
|||||||
package com.nis.domain.report;
|
package com.nis.domain.report;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.nis.domain.log.BaseLogEntity;
|
import com.nis.domain.log.BaseLogEntity;
|
||||||
|
import com.nis.util.excel.ExcelField;
|
||||||
|
|
||||||
public class NtcURLReport extends BaseLogEntity<NtcURLReport>{
|
public class NtcURLReport extends BaseLogEntity<NtcAsnRecord>{
|
||||||
|
|
||||||
private static final long serialVersionUID = -4947912502754359817L;
|
private static final long serialVersionUID = -4947912502754359817L;
|
||||||
|
|
||||||
|
@ExcelField(title="url",sort=1)
|
||||||
protected String url;
|
protected String url;
|
||||||
protected Integer urlCount;
|
/*protected long urlCount;*/
|
||||||
protected List<NtcURLReportBase> dataList;
|
@ExcelField(title="ipCount",sort=2)
|
||||||
|
protected long ipCount;
|
||||||
|
@ExcelField(title="connCount",sort=3)
|
||||||
|
protected long connCount;
|
||||||
|
@ExcelField(title="reportTime",sort=4)
|
||||||
|
private String reportTime;
|
||||||
|
//protected List<NtcURLReportBase> dataList;
|
||||||
|
|
||||||
protected String searchReportStartTime;//开始时间
|
protected String searchReportStartTime;//开始时间
|
||||||
protected String searchReportEndTime;//结束时间
|
protected String searchReportEndTime;//结束时间
|
||||||
@@ -42,18 +50,38 @@ public class NtcURLReport extends BaseLogEntity<NtcURLReport>{
|
|||||||
public void setUrl(String url) {
|
public void setUrl(String url) {
|
||||||
this.url = url;
|
this.url = url;
|
||||||
}
|
}
|
||||||
public Integer getUrlCount() {
|
/*public long getUrlCount() {
|
||||||
return urlCount;
|
return urlCount;
|
||||||
}
|
}
|
||||||
public void setUrlCount(Integer urlCount) {
|
public void setUrlCount(long urlCount) {
|
||||||
this.urlCount = urlCount;
|
this.urlCount = urlCount;
|
||||||
|
}*/
|
||||||
|
public long getIpCount() {
|
||||||
|
return ipCount;
|
||||||
}
|
}
|
||||||
public List<NtcURLReportBase> getDataList() {
|
public void setIpCount(long ipCount) {
|
||||||
|
this.ipCount = ipCount;
|
||||||
|
}
|
||||||
|
public long getConnCount() {
|
||||||
|
return connCount;
|
||||||
|
}
|
||||||
|
public void setConnCount(long connCount) {
|
||||||
|
this.connCount = connCount;
|
||||||
|
}
|
||||||
|
public String getReportTime() {
|
||||||
|
return reportTime;
|
||||||
|
}
|
||||||
|
public void setReportTime(String reportTime) {
|
||||||
|
this.reportTime = reportTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*public List<NtcURLReportBase> getDataList() {
|
||||||
return dataList;
|
return dataList;
|
||||||
}
|
}
|
||||||
public void setDataList(List<NtcURLReportBase> dataList) {
|
public void setDataList(List<NtcURLReportBase> dataList) {
|
||||||
this.dataList = dataList;
|
this.dataList = dataList;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.nis.web.controller.report;
|
package com.nis.web.controller.report;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -30,7 +29,6 @@ import com.nis.domain.report.NtcIpRangeReport;
|
|||||||
import com.nis.domain.report.NtcURLReport;
|
import com.nis.domain.report.NtcURLReport;
|
||||||
import com.nis.util.Constants;
|
import com.nis.util.Constants;
|
||||||
import com.nis.util.DateUtils;
|
import com.nis.util.DateUtils;
|
||||||
import com.nis.util.DictUtils;
|
|
||||||
import com.nis.util.httpclient.HttpClientUtil;
|
import com.nis.util.httpclient.HttpClientUtil;
|
||||||
import com.nis.web.controller.BaseController;
|
import com.nis.web.controller.BaseController;
|
||||||
import com.nis.web.security.UserUtils;
|
import com.nis.web.security.UserUtils;
|
||||||
@@ -52,6 +50,11 @@ public class ReportController extends BaseController {
|
|||||||
params.put("pageSize", page.getPageSize());
|
params.put("pageSize", page.getPageSize());
|
||||||
params.put("pageNo", page.getPageNo());
|
params.put("pageNo", page.getPageNo());
|
||||||
//判断请求参数
|
//判断请求参数
|
||||||
|
if(StringUtils.isNotEmpty(log.getSearchAsnType())){
|
||||||
|
params.put("searchAsnType", log.getSearchAsnType());
|
||||||
|
}else{
|
||||||
|
params.put("searchAsnType", 1);
|
||||||
|
}
|
||||||
if (StringUtils.isNotBlank(log.getSearchFoundStartTime())
|
if (StringUtils.isNotBlank(log.getSearchFoundStartTime())
|
||||||
&& StringUtils.isNotBlank(log.getSearchFoundEndTime())) {
|
&& StringUtils.isNotBlank(log.getSearchFoundEndTime())) {
|
||||||
params.put("searchFoundStartTime", log.getSearchFoundStartTime());
|
params.put("searchFoundStartTime", log.getSearchFoundStartTime());
|
||||||
@@ -75,7 +78,7 @@ public class ReportController extends BaseController {
|
|||||||
// "{\"bps\":\"3.68\",\"pps\":\"0.12\",\"sAsn\":\"9198\",\"dAsn\":\"19506\"},{\"bps\":\"1.77\",\"pps\":\"0.08\",\"sAsn\":\"38266\",\"dAsn\":\"N/A\"},"+
|
// "{\"bps\":\"3.68\",\"pps\":\"0.12\",\"sAsn\":\"9198\",\"dAsn\":\"19506\"},{\"bps\":\"1.77\",\"pps\":\"0.08\",\"sAsn\":\"38266\",\"dAsn\":\"N/A\"},"+
|
||||||
// "{\"bps\":\"493.55\",\"pps\":\"0.76\",\"sAsn\":\"30922\",\"dAsn\":\"29555\"},{\"bps\":\"26.63\",\"pps\":\"0.04\",\"sAsn\":\"44546\",\"dAsn\":\"197482\"},"+
|
// "{\"bps\":\"493.55\",\"pps\":\"0.76\",\"sAsn\":\"30922\",\"dAsn\":\"29555\"},{\"bps\":\"26.63\",\"pps\":\"0.04\",\"sAsn\":\"44546\",\"dAsn\":\"197482\"},"+
|
||||||
// "{\"bps\":\"25.43\",\"pps\":\"0.45\",\"sAsn\":\"44391\",\"dAsn\":\"9198\"},{\"bps\":\"52.96\",\"pps\":\"0.08\",\"sAsn\":\"29555\",\"dAsn\":\"14080\"}]}}";
|
// "{\"bps\":\"25.43\",\"pps\":\"0.45\",\"sAsn\":\"44391\",\"dAsn\":\"9198\"},{\"bps\":\"52.96\",\"pps\":\"0.08\",\"sAsn\":\"29555\",\"dAsn\":\"14080\"}]}}";
|
||||||
|
//recv="{\"status\":200,\"businessCode\":2001000,\"reason\":\"数据获取操作成功\",\"msg\":\"ASN通联关系(源,目的)检索成功\",\"fromuri\":\"/galaxy-service/service/log/v1/ntcAsnRecord\",\"logSource\":0,\"traceCode\":\"2018121722070122546049\",\"data\":{\"pageNo\":1,\"pageSize\":30,\"count\":24466,\"last\":816,\"list\":[{\"bps\":\"20.21\",\"pps\":\"0.17\",\"asn\":\"6858\"},{\"bps\":\"48662.31\",\"pps\":\"91.27\",\"asn\":\"60476\"},{\"bps\":\"3770.41\",\"pps\":\"5.38\",\"asn\":\"49963\"},{\"bps\":\"1.74\",\"pps\":\"0.01\",\"asn\":\"327892\"},{\"bps\":\"72.96\",\"pps\":\"0.13\",\"asn\":\"20598\"},{\"bps\":\"3.76\",\"pps\":\"0.03\",\"asn\":\"266106\"},{\"bps\":\"889.16\",\"pps\":\"1.28\",\"asn\":\"21928\"},{\"bps\":\"109274.80\",\"pps\":\"160.89\",\"asn\":\"200052\"},{\"bps\":\"3269.08\",\"pps\":\"4.85\",\"asn\":\"196977\"},{\"bps\":\"0.16\",\"pps\":\"0\",\"asn\":\"42643\"},{\"bps\":\"872.50\",\"pps\":\"1.22\",\"asn\":\"35017\"},{\"bps\":\"51079.66\",\"pps\":\"0\",\"asn\":\"57701\"},{\"bps\":\"1.25\",\"pps\":\"0.05\",\"asn\":\"58000\"},{\"bps\":\"0.45\",\"pps\":\"0.02\",\"asn\":\"266022\"},{\"bps\":\"0.16\",\"pps\":\"0\",\"asn\":\"43246\"},{\"bps\":\"5180.62\",\"pps\":\"9.11\",\"asn\":\"57172\"},{\"bps\":\"145.86\",\"pps\":\"0.29\",\"asn\":\"36994\"},{\"bps\":\"31.96\",\"pps\":\"0.06\",\"asn\":\"48536\"},{\"bps\":\"1009.25\",\"pps\":\"1.67\",\"asn\":\"4795\"},{\"bps\":\"0.86\",\"pps\":\"0.02\",\"asn\":\"196924\"},{\"bps\":\"0.5\",\"pps\":\"0\",\"asn\":\"21275\"},{\"bps\":\"13432.03\",\"pps\":\"0.28\",\"asn\":\"198640\"},{\"bps\":\"9.47\",\"pps\":\"0.33\",\"asn\":\"197287\"},{\"bps\":\"5.84\",\"pps\":\"0.02\",\"asn\":\"197155\"},{\"bps\":\"1890.60\",\"pps\":\"2.86\",\"asn\":\"29208\"},{\"bps\":\"18.26\",\"pps\":\"0.37\",\"asn\":\"51078\"},{\"bps\":\"1.53\",\"pps\":\"0.02\",\"asn\":\"5390\"},{\"bps\":\"16074.91\",\"pps\":\"30.44\",\"asn\":\"34974\"},{\"bps\":\"1695.46\",\"pps\":\"2.51\",\"asn\":\"31103\"},{\"bps\":\"42.18\",\"pps\":\"0.24\",\"asn\":\"6407\"}]}}";
|
||||||
if (StringUtils.isNotBlank(recv)) {
|
if (StringUtils.isNotBlank(recv)) {
|
||||||
Gson gson = new GsonBuilder().create();
|
Gson gson = new GsonBuilder().create();
|
||||||
LogRecvData<NtcAsnRecord> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcAsnRecord>>(){}.getType());
|
LogRecvData<NtcAsnRecord> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcAsnRecord>>(){}.getType());
|
||||||
@@ -133,7 +136,7 @@ public class ReportController extends BaseController {
|
|||||||
String url =Constants.LOG_BASE_URL + Constants.NTC_URL_REPORT;
|
String url =Constants.LOG_BASE_URL + Constants.NTC_URL_REPORT;
|
||||||
String recv = HttpClientUtil.getMsg(url, params, request);
|
String recv = HttpClientUtil.getMsg(url, params, request);
|
||||||
// String recv="{\"status\":200,\"businessCode\":2001000,\"reason\":\"数据获取操作成功\",\"msg\":\"URL统计查询成功\",\"fromuri\":\"/galaxy-service/service/log/v1/ntcURLReport\",\"logSource\":0,\"traceCode\":\"2018121610374649425419\",\"data\":{\"pageNo\":1,\"pageSize\":30,\"count\":174,\"last\":6,\"list\":[{\"url\":\"142.44.167.226/eventproxy/v1/bulk\",\"urlCount\":1686,\"dataList\":[{\"sum\":1686,\"ipAddr\":\"100.101.129.6\"}]},{\"url\":\"188.0.145.98/YZ/e1cib/dlist?cmd=query\",\"urlCount\":2652,\"dataList\":[{\"sum\":1248,\"ipAddr\":\"188.0.145.98\"},{\"sum\":1404,\"ipAddr\":\"89.218.9.2\"}]},{\"url\":\"cdn7.alpha-ag.ru/1c1233923d1a6/c51e872ab5861be256408f6cafa99ed8/luckypatcher_v7.5.9.apk\",\"urlCount\":882,\"dataList\":[{\"sum\":882,\"ipAddr\":\"100.81.118.193\"}]}]}}";
|
// String recv="{\"status\":200,\"businessCode\":2001000,\"reason\":\"数据获取操作成功\",\"msg\":\"URL统计查询成功\",\"fromuri\":\"/galaxy-service/service/log/v1/ntcURLReport\",\"logSource\":0,\"traceCode\":\"2018121610374649425419\",\"data\":{\"pageNo\":1,\"pageSize\":30,\"count\":174,\"last\":6,\"list\":[{\"url\":\"142.44.167.226/eventproxy/v1/bulk\",\"urlCount\":1686,\"dataList\":[{\"sum\":1686,\"ipAddr\":\"100.101.129.6\"}]},{\"url\":\"188.0.145.98/YZ/e1cib/dlist?cmd=query\",\"urlCount\":2652,\"dataList\":[{\"sum\":1248,\"ipAddr\":\"188.0.145.98\"},{\"sum\":1404,\"ipAddr\":\"89.218.9.2\"}]},{\"url\":\"cdn7.alpha-ag.ru/1c1233923d1a6/c51e872ab5861be256408f6cafa99ed8/luckypatcher_v7.5.9.apk\",\"urlCount\":882,\"dataList\":[{\"sum\":882,\"ipAddr\":\"100.81.118.193\"}]}]}}";
|
||||||
|
// recv = "{\"status\":200,\"businessCode\":2001000,\"reason\":\"数据获取操作成功\",\"msg\":\"URL统计查询成功\",\"fromuri\":\"/galaxy-service/service/log/v1/ntcURLReport\",\"logSource\":0,\"traceCode\":\"2018121721092486282928\",\"data\":{\"pageNo\":1,\"pageSize\":30,\"count\":11193,\"last\":374,\"list\":[{\"reportTime\":\"2018-12-17 14:15:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 14:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 14:45:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 16:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":10},{\"reportTime\":\"2018-12-17 16:45:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":10},{\"reportTime\":\"2018-12-17 18:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":8},{\"reportTime\":\"2018-12-17 18:45:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":8},{\"reportTime\":\"2018-12-17 19:15:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 19:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 19:45:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 20:00:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 14:15:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F114274\",\"ipCount\":1,\"connCount\":7},{\"reportTime\":\"2018-12-17 14:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F114274\",\"ipCount\":1,\"connCount\":7},{\"reportTime\":\"2018-12-17 14:45:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F114274\",\"ipCount\":1,\"connCount\":7},{\"reportTime\":\"2018-12-17 19:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F114274\",\"ipCount\":1,\"connCount\":7},{\"reportTime\":\"2018-12-17 14:15:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F46507\",\"ipCount\":1,\"connCount\":6},{\"reportTime\":\"2018-12-17 14:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F46507\",\"ipCount\":1,\"connCount\":6},{\"reportTime\":\"2018-12-17 19:15:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F46507\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 19:30:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F46507\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 19:45:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F46507\",\"ipCount\":1,\"connCount\":9},{\"reportTime\":\"2018-12-17 19:15:00\",\"url\":\"1.kyzd0r.com/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F50460\",\"ipCount\":1,\"connCount\":8},{\"reportTime\":\"2018-12-16 20:15:00\",\"url\":\"119.29.29.29/d?dn=ww.kyzd0r.com\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-16 21:00:00\",\"url\":\"119.29.29.29/d?dn=ww.kyzd0r.com\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-16 22:30:00\",\"url\":\"119.29.29.29/d?dn=ww.kyzd0r.com\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-16 22:45:00\",\"url\":\"119.29.29.29/d?dn=ww.kyzd0r.com\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-17 14:00:00\",\"url\":\"119.29.29.29/d?dn=ww.kyzd0r.com\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-17 19:45:00\",\"url\":\"185.203.72.28/away?url=http%3A%2F%2Fw.kyzd0r.com%2Fchlen-kluba%2F10159\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-17 15:30:00\",\"url\":\"biboba.ru/\",\"ipCount\":1,\"connCount\":2},{\"reportTime\":\"2018-12-17 17:00:00\",\"url\":\"biboba.ru/porno_video/style/img/logo.gif\",\"ipCount\":1,\"connCount\":1},{\"reportTime\":\"2018-12-17 01:15:00\",\"url\":\"bilimsite.kz/\",\"ipCount\":1,\"connCount\":1}]}}";
|
||||||
if (StringUtils.isNotBlank(recv)) {
|
if (StringUtils.isNotBlank(recv)) {
|
||||||
Gson gson = new GsonBuilder().create();
|
Gson gson = new GsonBuilder().create();
|
||||||
LogRecvData<NtcURLReport> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcURLReport>>(){}.getType());
|
LogRecvData<NtcURLReport> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcURLReport>>(){}.getType());
|
||||||
@@ -226,6 +229,11 @@ public class ReportController extends BaseController {
|
|||||||
params.put("pageSize", page.getPageSize());
|
params.put("pageSize", page.getPageSize());
|
||||||
params.put("pageNo", page.getPageNo());
|
params.put("pageNo", page.getPageNo());
|
||||||
//判断请求参数
|
//判断请求参数
|
||||||
|
if(StringUtils.isNotEmpty(log.getSearchAsnType())){
|
||||||
|
params.put("searchAsnType", log.getSearchAsnType());
|
||||||
|
}else{
|
||||||
|
params.put("searchAsnType", 1);
|
||||||
|
}
|
||||||
if (StringUtils.isNotBlank(log.getSearchFoundStartTime())
|
if (StringUtils.isNotBlank(log.getSearchFoundStartTime())
|
||||||
&& StringUtils.isNotBlank(log.getSearchFoundEndTime())) {
|
&& StringUtils.isNotBlank(log.getSearchFoundEndTime())) {
|
||||||
params.put("searchFoundStartTime", log.getSearchFoundStartTime());
|
params.put("searchFoundStartTime", log.getSearchFoundStartTime());
|
||||||
@@ -330,7 +338,7 @@ public class ReportController extends BaseController {
|
|||||||
titleList.add("Ntc_Ip_Range_Report");
|
titleList.add("Ntc_Ip_Range_Report");
|
||||||
classMap.put("Ntc_Ip_Range_Report", NtcIpRangeReport.class);
|
classMap.put("Ntc_Ip_Range_Report", NtcIpRangeReport.class);
|
||||||
SysUser user = UserUtils.getUser();
|
SysUser user = UserUtils.getUser();
|
||||||
hColumns += ",cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
|
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,"
|
+ "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_asn,d_asn,s_subscribe_id,d_subscribe_id,"
|
+ "stream_type,nest_addr_list,server_locate,client_locate,s_asn,d_asn,s_subscribe_id,d_subscribe_id,"
|
||||||
+ "user_region,scene_file,";
|
+ "user_region,scene_file,";
|
||||||
@@ -351,5 +359,85 @@ public class ReportController extends BaseController {
|
|||||||
addMessage(redirectAttributes, "error", "export_failed");
|
addMessage(redirectAttributes, "error", "export_failed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//asnExport
|
||||||
|
@RequestMapping(value = "httpsExport")
|
||||||
|
public void httpsExport(@ModelAttribute("log") NtcURLReport log, Model model, String hColumns, String type,
|
||||||
|
HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
|
||||||
|
try {
|
||||||
|
// export data info
|
||||||
|
List<String> titleList = new ArrayList<String>();
|
||||||
|
Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
|
||||||
|
Map<String, List> dataMap = new HashMap<String, List>();
|
||||||
|
Map<String, String> noExportMap = new HashMap<String, String>();
|
||||||
|
// ---------------------------
|
||||||
|
PageLog<NtcURLReport> page = new PageLog<NtcURLReport>(request, response);
|
||||||
|
page.setPageNo(1);
|
||||||
|
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
|
||||||
|
Map<String, Object> params = new HashMap<String, Object>();
|
||||||
|
params.put("pageSize", page.getPageSize());
|
||||||
|
params.put("pageNo", page.getPageNo());
|
||||||
|
//判断请求参数
|
||||||
|
if (StringUtils.isNotBlank(log.getSearchReportStartTime())
|
||||||
|
&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
|
||||||
|
params.put("searchReportStartTime", log.getSearchReportStartTime());
|
||||||
|
params.put("searchReportEndTime", log.getSearchReportEndTime());
|
||||||
|
} else {
|
||||||
|
Calendar time = Calendar.getInstance();
|
||||||
|
String searchEndTime = DateUtils.formatDateTime(time.getTime());
|
||||||
|
time.add(Calendar.HOUR_OF_DAY, -1);
|
||||||
|
String searchStartTime = DateUtils.formatDateTime(time.getTime());
|
||||||
|
|
||||||
|
params.put("searchReportStartTime", searchStartTime);
|
||||||
|
params.put("searchReportEndTime", searchEndTime);
|
||||||
|
log.setSearchReportStartTime(searchStartTime);
|
||||||
|
log.setSearchReportEndTime(searchEndTime);
|
||||||
|
}
|
||||||
|
//url参数
|
||||||
|
if (StringUtils.isNotBlank(log.getSearchUrl())) {
|
||||||
|
params.put("searchUrl", log.getSearchUrl());
|
||||||
|
}
|
||||||
|
|
||||||
|
String url =Constants.LOG_BASE_URL + Constants.NTC_URL_REPORT;
|
||||||
|
// String recv="{\"status\":200,\"businessCode\":2001000,\"reason\":\"数据获取操作成功\",\"msg\":\"ASN通联关系(源,目的)检索成功\",\"fromuri\":\"/galaxy-service/service/log/v1/ntcAsnRecord\",\"logSource\":0,\"traceCode\":\"2018121609404451375322\",\"data\":"
|
||||||
|
// +"{\"pageNo\":1,\"pageSize\":30,\"count\":66564,\"last\":2219,\"list\":[{\"bps\":\"8.56\",\"pps\":\"0.07\",\"sAsn\":\"9198\",\"dAsn\":\"40545_26836\"},"+
|
||||||
|
// "{\"bps\":\"3.68\",\"pps\":\"0.12\",\"sAsn\":\"9198\",\"dAsn\":\"19506\"},{\"bps\":\"1.77\",\"pps\":\"0.08\",\"sAsn\":\"38266\",\"dAsn\":\"N/A\"},"+
|
||||||
|
// "{\"bps\":\"493.55\",\"pps\":\"0.76\",\"sAsn\":\"30922\",\"dAsn\":\"29555\"},{\"bps\":\"26.63\",\"pps\":\"0.04\",\"sAsn\":\"44546\",\"dAsn\":\"197482\"},"+
|
||||||
|
// "{\"bps\":\"25.43\",\"pps\":\"0.45\",\"sAsn\":\"44391\",\"dAsn\":\"9198\"},{\"bps\":\"52.96\",\"pps\":\"0.08\",\"sAsn\":\"29555\",\"dAsn\":\"14080\"}]}}";
|
||||||
|
String recv = HttpClientUtil.getMsg(url, params, request);
|
||||||
|
List<NtcURLReport> list = new ArrayList<NtcURLReport>();
|
||||||
|
if (StringUtils.isNotBlank(recv)) {
|
||||||
|
Gson gson = new GsonBuilder().create();
|
||||||
|
LogRecvData<NtcURLReport> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcURLReport>>() {
|
||||||
|
}.getType());
|
||||||
|
if (fromJson.getStatus().intValue() == 200) {
|
||||||
|
Page<NtcURLReport> data = fromJson.getData();
|
||||||
|
list = data.getList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//
|
||||||
|
titleList.add("Ntc_HTTPS_Report");
|
||||||
|
classMap.put("Ntc_HTTPS_Report", NtcURLReport.class);
|
||||||
|
//SysUser user = UserUtils.getUser();
|
||||||
|
/*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,";*/
|
||||||
|
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,";
|
||||||
|
String cfgIndexInfoNoExport = "," + hColumns;
|
||||||
|
noExportMap.put("Ntc_HTTPS_Report", cfgIndexInfoNoExport);
|
||||||
|
dataMap.put("Ntc_HTTPS_Report", list);
|
||||||
|
/* } */
|
||||||
|
if ("csv".equals(type)) {
|
||||||
|
this._exportCsv(model, request, response, redirectAttributes, "Ntc_HTTPS_Report", titleList, classMap,
|
||||||
|
dataMap, noExportMap);
|
||||||
|
} else {
|
||||||
|
this._export(model, request, response, redirectAttributes, "Ntc_HTTPS_Report", titleList, classMap, dataMap,
|
||||||
|
noExportMap);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("Ntc_HTTPS_Report export failed", e);
|
||||||
|
addMessage(redirectAttributes, "error", "export_failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1402,4 +1402,8 @@ ip_group_manage=IP Group Manage
|
|||||||
ip_spoofing_group_manage=IP Spoofing Group Manage
|
ip_spoofing_group_manage=IP Spoofing Group Manage
|
||||||
min_tcp=Min
|
min_tcp=Min
|
||||||
max_tcp=Max
|
max_tcp=Max
|
||||||
APP_TCP_SESSION_BYTE=Session
|
APP_TCP_SESSION_BYTE=Session
|
||||||
|
ip_count=Unique IP Count
|
||||||
|
counnection_count=Connection Count
|
||||||
|
asn=asn
|
||||||
|
Unique_num=Unique
|
||||||
@@ -1406,4 +1406,8 @@ ip_group_manage=IP Group Manage
|
|||||||
ip_spoofing_group_manage=IP Spoofing Group Manage
|
ip_spoofing_group_manage=IP Spoofing Group Manage
|
||||||
min_tcp=Min
|
min_tcp=Min
|
||||||
max_tcp=Max
|
max_tcp=Max
|
||||||
APP_TCP_SESSION_BYTE=Session
|
APP_TCP_SESSION_BYTE=Session
|
||||||
|
ip_count=Unique IP Count
|
||||||
|
counnection_count=Connection Count
|
||||||
|
asn=asn
|
||||||
|
Unique_num=Unique
|
||||||
@@ -1402,4 +1402,8 @@ ip_group_manage=IP\u5206\u7EC4\u7BA1\u7406
|
|||||||
ip_spoofing_group_manage=IP Spoofing\u5206\u7EC4\u7BA1\u7406
|
ip_spoofing_group_manage=IP Spoofing\u5206\u7EC4\u7BA1\u7406
|
||||||
min_tcp=Min
|
min_tcp=Min
|
||||||
max_tcp=Max
|
max_tcp=Max
|
||||||
APP_TCP_SESSION_BYTE=Session
|
APP_TCP_SESSION_BYTE=Session
|
||||||
|
ip_count=Unique IP Count
|
||||||
|
counnection_count=Connection Count
|
||||||
|
asn=asn
|
||||||
|
Unique_num=Unique
|
||||||
@@ -72,7 +72,13 @@
|
|||||||
<input name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
|
<input name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
|
||||||
value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="pull-left">
|
||||||
|
<form:select path="searchAsnType" class="selectpicker select2 input-small">
|
||||||
|
<form:option value="1"><spring:message code="d_asn"/></form:option>
|
||||||
|
<form:option value="2"><spring:message code="s_asn"/></form:option>
|
||||||
|
</form:select>
|
||||||
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||||
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||||
@@ -103,8 +109,7 @@
|
|||||||
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
|
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
|
||||||
<th class="sort-column bps" columan="bps"><spring:message code="bps"/></th>
|
<th class="sort-column bps" columan="bps"><spring:message code="bps"/></th>
|
||||||
<th class="sort-column pps" columan="pps"><spring:message code="pps"/></th>
|
<th class="sort-column pps" columan="pps"><spring:message code="pps"/></th>
|
||||||
<th class="sort-column s_asn" columan="s_asn"><spring:message code="s_asn"/></th>
|
<th class="sort-column s_asn" columan="asn"><spring:message code="asn"/></th>
|
||||||
<th class="sort-column d_asn" columan="d_asn"><spring:message code="d_asn"/></th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -113,12 +118,10 @@
|
|||||||
<%-- <td>
|
<%-- <td>
|
||||||
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
|
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
|
||||||
<a href="javascript:void(0)" name="viewLogInfo" ><i class="icon-book-open"></i></a>
|
<a href="javascript:void(0)" name="viewLogInfo" ><i class="icon-book-open"></i></a>
|
||||||
</td> --%>
|
</td> --%>
|
||||||
|
|
||||||
<td>${log.bps }</td>
|
<td>${log.bps }</td>
|
||||||
<td>${log.pps }</td>
|
<td>${log.pps }</td>
|
||||||
<td>${log.sAsn}</td>
|
<td>${log.asn}</td>
|
||||||
<td>${log.dAsn}</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -99,6 +99,15 @@
|
|||||||
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||||
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="pull-right">
|
||||||
|
<div class="btn-group">
|
||||||
|
<sys:delRow url="${ctx}/report/httpsExport?type=excel" searchUrl="${ctx}/report/httpsUrlList" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-icon-only btn-default setfields tooltips"
|
||||||
|
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
|
||||||
|
<i class="icon-wrench"></i>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!-- 搜索内容与操作按钮栏 -->
|
<!-- 搜索内容与操作按钮栏 -->
|
||||||
@@ -114,37 +123,24 @@
|
|||||||
<%-- <th><spring:message code="log"/></th> --%>
|
<%-- <th><spring:message code="log"/></th> --%>
|
||||||
<%-- <th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
|
<%-- <th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
|
||||||
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
|
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
|
||||||
<th class="sort-column url" columan="url" style="width: 350px;"><spring:message code="url"/></th>
|
<%--<th class="sort-column url" column="url" style="width: 350px;"><spring:message code="url"/></th>
|
||||||
<th class="sort-column ip_addr" columan="ip_addr"><spring:message code="ip_addr"/></th>
|
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
|
||||||
<th class="sort-column sum" columan="sum"><spring:message code="sum"/></th>
|
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
|
||||||
<th class="sort-column url_count" columan="url_count"><spring:message code="url_count"/></th>
|
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
|
||||||
|
<th class="sort-column url" column="url" style="width: 350px;"><spring:message code="url"/></th>
|
||||||
|
<th class="sort-column ip_addr" column="ipCount"><spring:message code="ip_count"/></th>
|
||||||
|
<th class="sort-column sum" column="connCount"><spring:message code="counnection_count"/></th>
|
||||||
|
<th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<c:forEach var="log" items="${page.list }" varStatus="status">
|
<c:forEach var="log" items="${page.list }" varStatus="status">
|
||||||
<c:if test="${empty log.dataList}">
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>${log.url }</td>
|
<td>${log.url }</td>
|
||||||
<td></td>
|
<td>${log.ipCount }</td>
|
||||||
<td></td>
|
<td>${log.connCount }</td>
|
||||||
<td >${log.urlCount}</td>
|
<td >${log.reportTime}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</c:if>
|
|
||||||
<c:if test="${!empty log.dataList}">
|
|
||||||
<c:forEach var="ips" items="${log.dataList}" varStatus="status">
|
|
||||||
<tr>
|
|
||||||
<c:if test="${status.index==0}">
|
|
||||||
<td rowspan="${fn:length(log.dataList)}">${log.url }</td>
|
|
||||||
</c:if>
|
|
||||||
<td>${ips.ipAddr }</td>
|
|
||||||
<td >${ips.sum}</td>
|
|
||||||
<c:if test="${status.index==0}">
|
|
||||||
<td rowspan="${fn:length(log.dataList)}">${log.urlCount}</td>
|
|
||||||
</c:if>
|
|
||||||
</tr>
|
|
||||||
</c:forEach>
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
Reference in New Issue
Block a user