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

日志检索模块导出问题修改

Browse Source
This commit is contained in:
shangguanyanfei
2019-01-11 10:00:22 +08:00
parent 55edab464d
commit bfb931747b
17 changed files with 155 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/log/BaseLogEntity.java
View File

@@ -47,8 +47,8 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected String serverLocate;// 服务端地址定位信息
@ExcelField(title="client_locate",sort=68)
protected String clientLocate;// 客户端地址定位信息
@ExcelField(title="user_region",sort=76)
protected String userRegion; //用户自定义
// @ExcelField(title="user_region",sort=76)
// protected String userRegion; //用户自定义
@ExcelField(title="s_asn",sort=70)
protected String sAsn;//客户端ASN
@ExcelField(title="d_asn",sort=71)
@@ -211,12 +211,12 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
public void setAddrList(String addrList) {
this.addrList = addrList;
}
public String getUserRegion() {
/*public String getUserRegion() {
return userRegion;
}
public void setUserRegion(String userRegion) {
this.userRegion = userRegion;
}
}*/
public Integer getFunctionId() {
return functionId;
}
@@ -307,8 +307,8 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
+ transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort
+ ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId
+ ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList="
+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + ", userRegion="
+ userRegion + ", sAsn=" + sAsn + ", dAsn=" + dAsn + ", sSubscribeId=" + sSubscribeId
+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + /*", userRegion="
+ userRegion +*/ ", sAsn=" + sAsn + ", dAsn=" + dAsn + ", sSubscribeId=" + sSubscribeId
+ ", dSubscribeId=" + dSubscribeId + ", sceneFile=" + sceneFile + ", functionId=" + functionId
+ ", action=" + action + ", date=" + date + ", seltype=" + seltype + ", searchFoundStartTime="
+ searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime + ", isLogTotalSearch="

2
src/main/java/com/nis/domain/log/NtcDdosLog.java
View File

@@ -33,7 +33,7 @@ public class NtcDdosLog extends BaseLogEntity<NtcDdosLog> {
@ExcelField(title="attack_total_byte",sort=14)
@ApiModelProperty(value = "攻击累积字节数", required = true)
protected String attackTotalByte;
@ExcelField(title="is_block ",dictType="SYS_YES_NO",sort=15)
@ExcelField(title="is_block",dictType="SYS_YES_NO",sort=15)
@ApiModelProperty(value = "攻击流量是否被丢弃", required = true)
protected Integer isBlock;

8
src/main/java/com/nis/domain/log/PxyHttpLog.java
View File

@@ -24,13 +24,13 @@ public class PxyHttpLog extends BaseLogEntity<NtcIpLog> {
private String contentType;
@ExcelField(title="set_cookie",sort=16)
private String setCookie;
@ExcelField(title="req_header",sort=17)
// @ExcelField(title="req_header",sort=17)
private String reqHeader;
@ExcelField(title="resp_header",sort=18)
// @ExcelField(title="resp_header",sort=18)
private String respHeader;
@ExcelField(title="req_body",sort=17)
private String reqBody;
@ExcelField(title="resp_body",sort=18)
private String resBody;
@ExcelField(title="website",sort=19)
private String website;