diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java index a2f048e..d756a62 100644 --- a/src/main/java/com/nis/domain/LogEntity.java +++ b/src/main/java/com/nis/domain/LogEntity.java @@ -111,9 +111,52 @@ public abstract class LogEntity implements Serializable { protected String searchFoundEndTime;//结束发现时间 //add by dxy 2019-01-05 仅限于NtcConnRecordLog需求,考虑以后可能会放开其他日志查询,所以放到公共类 + protected String searchSAsn;//sAsn + protected String searchDAsn;//dAsn protected String searchServerLocate;//serverLocate protected String searchClientLocate;//clientLocate + protected String searchSSubscribeId;//sSubscribeId + protected String searchDSubscribeId;//dSubscribeId + @JsonIgnore + public String getSearchSAsn() { + return searchSAsn; + } + + public void setSearchSAsn(String searchSAsn) { + this.searchSAsn = searchSAsn; + } + + @JsonIgnore + public String getSearchDAsn() { + return searchDAsn; + } + + public void setSearchDAsn(String searchDAsn) { + this.searchDAsn = searchDAsn; + } + + @JsonIgnore + public String getSearchSSubscribeId() { + return searchSSubscribeId; + } + + public void setSearchSSubscribeId(String searchSSubscribeId) { + this.searchSSubscribeId = searchSSubscribeId; + } + + + @JsonIgnore + public String getSearchDSubscribeId() { + return searchDSubscribeId; + } + + public void setSearchDSubscribeId(String searchDSubscribeId) { + this.searchDSubscribeId = searchDSubscribeId; + } + + + @JsonIgnore public String getSearchServerLocate() { return searchServerLocate; } @@ -122,6 +165,8 @@ public abstract class LogEntity implements Serializable { this.searchServerLocate = searchServerLocate; } + + @JsonIgnore public String getSearchClientLocate() { return searchClientLocate; } diff --git a/src/main/java/com/nis/domain/restful/NtcConnRecordLog.java b/src/main/java/com/nis/domain/restful/NtcConnRecordLog.java index 551d2f4..0c95f55 100644 --- a/src/main/java/com/nis/domain/restful/NtcConnRecordLog.java +++ b/src/main/java/com/nis/domain/restful/NtcConnRecordLog.java @@ -37,8 +37,7 @@ public class NtcConnRecordLog extends LogEntity { @ApiModelProperty(value = "", required = true) protected Long webId; - protected String searchSAsn;//sAsn - protected String searchDAsn;//dAsn + protected String searchAppId;//app protected String searchWebId;//web protected String searchProtoId;//proto @@ -110,25 +109,6 @@ public class NtcConnRecordLog extends LogEntity { this.webId = webId; } - - @JsonIgnore - public String getSearchSAsn() { - return searchSAsn; - } - - public void setSearchSAsn(String searchSAsn) { - this.searchSAsn = searchSAsn; - } - - @JsonIgnore - public String getSearchDAsn() { - return searchDAsn; - } - - public void setSearchDAsn(String searchDAsn) { - this.searchDAsn = searchDAsn; - } - @JsonIgnore public String getSearchAppId() { return searchAppId;