合并代码

src/main/java/com/nis/domain/LogEntity.java

@@ -109,6 +109,26 @@ public abstract class LogEntity<T> implements Serializable {
 	protected String searchCapIp;//处理机IP
 	protected String searchFoundStartTime;//开始发现时间
 	protected String searchFoundEndTime;//结束发现时间
+	
+	//add by dxy 2019-01-05 仅限于NtcConnRecordLog需求，考虑以后可能会放开其他日志查询，所以放到公共类
+	protected String searchServerLocate;//serverLocate
+	protected String searchClientLocate;//clientLocate
+
+	public String getSearchServerLocate() {
+		return searchServerLocate;
+	}
+
+	public void setSearchServerLocate(String searchServerLocate) {
+		this.searchServerLocate = searchServerLocate;
+	}
+
+	public String getSearchClientLocate() {
+		return searchClientLocate;
+	}
+
+	public void setSearchClientLocate(String searchClientLocate) {
+		this.searchClientLocate = searchClientLocate;
+	}
 
 	/**
 	 * 当前实体分页对象

src/main/java/com/nis/domain/restful/NtcConnRecordLog.java

@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -28,7 +29,23 @@ public class NtcConnRecordLog extends LogEntity<NtcConnRecordLog> {
 	protected String c2sByteNum;
 	@ApiModelProperty(value = "", required = true)
 	protected String s2cByteNum;
+	
+	@ApiModelProperty(value = "", required = true)
+	protected Long protoId;
+	@ApiModelProperty(value = "", required = true)
+	protected Long appId;
+	@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
+	//protected String searchServerLocate;//serverLocate
+	//protected String searchClientLocate;//clientLocate
+	
+	@JsonIgnore
 	public String getAppLabel() {
 		return appLabel;
 	}
@@ -69,4 +86,76 @@ public class NtcConnRecordLog extends LogEntity<NtcConnRecordLog> {
 		this.s2cByteNum = s2cByteNum;
 	}
 
+	public Long getProtoId() {
+		return protoId;
+	}
+
+	public void setProtoId(Long protoId) {
+		this.protoId = protoId;
+	}
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public Long getWebId() {
+		return webId;
+	}
+
+	public void setWebId(Long webId) {
+		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;
+	}
+
+	public void setSearchAppId(String searchAppId) {
+		this.searchAppId = searchAppId;
+	}
+
+	@JsonIgnore
+	public String getSearchWebId() {
+		return searchWebId;
+	}
+
+	public void setSearchWebId(String searchWebId) {
+		this.searchWebId = searchWebId;
+	}
+
+	@JsonIgnore
+	public String getSearchProtoId() {
+		return searchProtoId;
+	}
+
+	public void setSearchProtoId(String searchProtoId) {
+		this.searchProtoId = searchProtoId;
+	}
+	
+	
+
 }

src/main/java/com/nis/domain/restful/dashboard/AppConnRecordStatistic.java

@@ -0,0 +1,48 @@
+package com.nis.domain.restful.dashboard;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class AppConnRecordStatistic extends AppTrendEntity{
+	
+	protected String ipAddr;
+	protected String pktNum;
+	protected String byteNum;
+	protected String logNum;	//日志数量
+	
+	public AppConnRecordStatistic() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+	public AppConnRecordStatistic(String ipAddr, String pktNum, String byteNum,
+			String logNum) {
+		super();
+		this.ipAddr = ipAddr;
+		this.pktNum = pktNum;
+		this.byteNum = byteNum;
+		this.logNum = logNum;
+	}
+	public String getIpAddr() {
+		return ipAddr;
+	}
+	public void setIpAddr(String ipAddr) {
+		this.ipAddr = ipAddr;
+	}
+	public String getPktNum() {
+		return pktNum;
+	}
+	public void setPktNum(String pktNum) {
+		this.pktNum = pktNum;
+	}
+	public String getByteNum() {
+		return byteNum;
+	}
+	public void setByteNum(String byteNum) {
+		this.byteNum = byteNum;
+	}
+	public String getLogNum() {
+		return logNum;
+	}
+	public void setLogNum(String logNum) {
+		this.logNum = logNum;
+	}
+}

src/main/java/com/nis/domain/restful/dashboard/AppTrendEntity.java

@@ -0,0 +1,40 @@
+package com.nis.domain.restful.dashboard;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class AppTrendEntity{
+	
+	private String searchAppId;
+	private String searchStartTime;
+	private String searchEndTime;
+	private String searchEntranceId;
+	
+	@JsonIgnore
+	public String getSearchAppId() {
+		return searchAppId;
+	}
+	public void setSearchAppId(String searchAppId) {
+		this.searchAppId = searchAppId;
+	}
+	@JsonIgnore
+	public String getSearchStartTime() {
+		return searchStartTime;
+	}
+	public void setSearchStartTime(String searchStartTime) {
+		this.searchStartTime = searchStartTime;
+	}
+	@JsonIgnore
+	public String getSearchEndTime() {
+		return searchEndTime;
+	}
+	public void setSearchEndTime(String searchEndTime) {
+		this.searchEndTime = searchEndTime;
+	}
+	@JsonIgnore
+	public String getSearchEntranceId() {
+		return searchEntranceId;
+	}
+	public void setSearchEntranceId(String searchEntranceId) {
+		this.searchEntranceId = searchEntranceId;
+	}
+}

src/main/java/com/nis/domain/restful/dashboard/TrafficAppFocusStatistic.java

@@ -0,0 +1,29 @@
+package com.nis.domain.restful.dashboard;
+
+import java.util.Date;
+
+public class TrafficAppFocusStatistic extends AppTrendEntity{
+
+	private Date time;
+	private Long sipNum;
+	private Long dipNum;
+
+	public Date getTime() {
+		return time;
+	}
+	public void setTime(Date time) {
+		this.time = time;
+	}
+	public Long getSipNum() {
+		return sipNum;
+	}
+	public void setSipNum(Long sipNum) {
+		this.sipNum = sipNum;
+	}
+	public Long getDipNum() {
+		return dipNum;
+	}
+	public void setDipNum(Long dipNum) {
+		this.dipNum = dipNum;
+	}
+}