From 09b33e529e915d2d87abbfef8fd625d7e812f3ac Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Thu, 16 Aug 2018 16:16:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8B=86=E5=88=86=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AD=97=E6=AE=B5=EF=BC=9Asubscribe=5Fid=20?= =?UTF-8?q?=EF=BC=9As=5F=20subscribe=5Fid=E3=80=81d=5F=20subscribe=5Fid?= =?UTF-8?q?=EF=BC=9B=202=E3=80=81NTC=5FHTTP=5FLOG=E5=A2=9Ereq=5Fhdr=5Fkey?= =?UTF-8?q?=E3=80=81req=5Fbody=5Fkey=E3=80=81res=5Fhdr=5Fkey=E3=80=81res?= =?UTF-8?q?=5Fbody=5Fkey=EF=BC=9B=203=E3=80=81=E6=97=A5=E5=BF=97=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0scene=5Ffile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/LogEntity.java | 45 +++++-- .../com/nis/domain/restful/NtcHttpLog.java | 46 ++++++- .../java/com/nis/web/dao/DfLogSearchDao.xml | 117 +++++++++++++----- 3 files changed, 171 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java index ba8899a..157d6f8 100644 --- a/src/main/java/com/nis/domain/LogEntity.java +++ b/src/main/java/com/nis/domain/LogEntity.java @@ -82,8 +82,12 @@ public abstract class LogEntity implements Serializable { protected String sAsn; @ApiModelProperty(value = "服务端ASN", required = true) protected String dAsn; - @ApiModelProperty(value = "用户名", required = true) - protected String subscribeId; + @ApiModelProperty(value = "客户端用户名", required = true) + protected String sSubscribeId; + @ApiModelProperty(value = "服务器用户名", required = true) + protected String dSubscribeId; + @ApiModelProperty(value = "现场日志文件地址", required = true) + protected String sceneFile; protected String searchCfgId;//配置id protected String searchTransProto;//协议类型 @@ -482,15 +486,40 @@ public abstract class LogEntity implements Serializable { return dAsn; } /** - * @param subscribeId the subscribeId to set + * @param sSubscribeId the sSubscribeId to set */ - public void setSubscribeId(String subscribeId) { - this.subscribeId = subscribeId; + public void setsSubscribeId(String sSubscribeId) { + this.sSubscribeId = sSubscribeId; } /** - * @return the subscribeId + * @return the sSubscribeId */ - public String getSubscribeId() { - return subscribeId; + public String getsSubscribeId() { + return sSubscribeId; } + /** + * @param dSubscribeId the dSubscribeId to set + */ + public void setdSubscribeId(String dSubscribeId) { + this.dSubscribeId = dSubscribeId; + } + /** + * @return the dSubscribeId + */ + public String getdSubscribeId() { + return dSubscribeId; + } + /** + * @param sceneFile the sceneFile to set + */ + public void setSceneFile(String sceneFile) { + this.sceneFile = sceneFile; + } + /** + * @return the sceneFile + */ + public String getSceneFile() { + return sceneFile; + } + } diff --git a/src/main/java/com/nis/domain/restful/NtcHttpLog.java b/src/main/java/com/nis/domain/restful/NtcHttpLog.java index db3517a..3315e65 100644 --- a/src/main/java/com/nis/domain/restful/NtcHttpLog.java +++ b/src/main/java/com/nis/domain/restful/NtcHttpLog.java @@ -27,7 +27,19 @@ public class NtcHttpLog extends LogEntity { @ApiModelProperty(value="网站域名", required=true) protected String website; + + @ApiModelProperty(value="请求头转储文件KEY", required=true) + protected String reqHdrKey; + @ApiModelProperty(value="请求体转储文件KEY", required=true) + protected String reqBodyKey; + + @ApiModelProperty(value="应答头转储文件KEY", required=true) + protected String resHdrKey; + + @ApiModelProperty(value="应答体转储文件KEY", required=true) + protected String resBodyKey; + public String getUrl() { return url; } @@ -80,5 +92,37 @@ public class NtcHttpLog extends LogEntity { */ public String getWebsite() { return website; - } + } + + public String getReqHdrKey() { + return reqHdrKey; + } + + public void setReqHdrKey(String reqHdrKey) { + this.reqHdrKey = reqHdrKey; + } + + public String getReqBodyKey() { + return reqBodyKey; + } + + public void setReqBodyKey(String reqBodyKey) { + this.reqBodyKey = reqBodyKey; + } + + public String getResHdrKey() { + return resHdrKey; + } + + public void setResHdrKey(String resHdrKey) { + this.resHdrKey = resHdrKey; + } + + public String getResBodyKey() { + return resBodyKey; + } + + public void setResBodyKey(String resBodyKey) { + this.resBodyKey = resBodyKey; + } } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index b8b2e45..b81ee47 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -43,7 +43,9 @@ - + + + @@ -68,14 +70,21 @@ - + + + + + + + + @@ -100,7 +109,9 @@ - + + + @@ -139,7 +150,9 @@ - + + + @@ -172,7 +185,9 @@ - + + + @@ -204,7 +219,9 @@ - + + + @@ -234,7 +251,9 @@ - + + + @@ -263,7 +282,9 @@ - + + + @@ -294,7 +315,9 @@ - + + + @@ -323,7 +346,9 @@ - + + + @@ -355,7 +380,9 @@ - + + + @@ -383,7 +410,9 @@ - + + + @@ -408,7 +437,9 @@ - + + + @@ -441,7 +472,9 @@ - + + + @@ -471,7 +504,9 @@ - + + + @@ -503,7 +538,9 @@ - + + + @@ -535,7 +572,9 @@ - + + + @@ -567,7 +606,9 @@ - + + + @@ -600,7 +641,9 @@ - + + + @@ -639,7 +682,9 @@ - + + + @@ -679,7 +724,9 @@ - + + + @@ -712,7 +759,9 @@ - + + + @@ -744,7 +793,9 @@ - + + + @@ -776,7 +827,9 @@ - + + + @@ -808,7 +861,9 @@ - + + + @@ -841,7 +896,9 @@ - + + + @@ -880,7 +937,9 @@ - + + + @@ -918,6 +977,8 @@ - + + + \ No newline at end of file