Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交

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

@@ -34,7 +34,7 @@ public class PageLog<T> {
 	
 	private long count;// 总记录数，设置为“-1”表示不查询总数
 	private int first;// 首页索引
-//	private int last;// 尾页索引
+	private int last;// 尾页索引
 	private int prev;// 上一页索引
 	private int next;// 下一页索引
 	
@@ -42,8 +42,8 @@ public class PageLog<T> {
 	private boolean firstPage;//是否是第一页
 	private boolean lastPage;//是否是最后一页
 
-//	private int length = 8;// 显示页面长度
-//	private int slider = 1;// 前后显示页面长度
+	private int length = 8;// 显示页面长度
+	private int slider = 1;// 前后显示页面长度
 	
 	private List<T> list = new ArrayList<T>();
 	
@@ -266,7 +266,49 @@ public class PageLog<T> {
 				
 		//1
 		this.first = 1;
-		
+		// 控制接口是否启用count last
+		if (this.count!=0) {
+			this.last = (int)(count / (this.pageSize < 1 ? 20 : this.pageSize) + first - 1);
+			
+			if (this.count % this.pageSize != 0 || this.last == 0) {
+				this.last++;
+			}
+
+			if (this.last < this.first) {
+				this.last = this.first;
+			}
+			
+			if (this.pageNo <= 1) {
+				this.pageNo = this.first;
+				this.firstPage=true;
+			}
+
+			if (this.pageNo >= this.last) {
+				this.pageNo = this.last;
+				this.lastPage=true;
+			}
+
+			if (this.pageNo < this.last - 1) {
+				this.next = this.pageNo + 1;
+			} else {
+				this.next = this.last;
+			}
+
+			if (this.pageNo > 1) {
+				this.prev = this.pageNo - 1;
+			} else {
+				this.prev = this.first;
+			}
+			
+			//2
+			if (this.pageNo < this.first) {// 如果当前页小于首页
+				this.pageNo = this.first;
+			}
+
+			if (this.pageNo > this.last) {// 如果当前页大于尾页
+				this.pageNo = this.last;
+			}
+		}else {
 		//首页
 		if (this.pageNo <= 1) {
 			this.pageNo = this.first;
@@ -293,7 +335,7 @@ public class PageLog<T> {
 		if (this.pageNo < this.first) {// 如果当前页小于首页
 			this.pageNo = this.first;
 		}
-
+	}
 		
 	}
 	
@@ -303,14 +345,92 @@ public class PageLog<T> {
 	 */
 	@Override
 	public String toString() {
-		
+		StringBuilder sb = new StringBuilder();
+		// 控制接口返回count last 切换分页
+		if (this.count!=0) {
+			if(list != null && list.isEmpty()) {
+				return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
+			}
+			if (pageNo == first) {// 如果是首页
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+			} else {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+			}
 
+			int begin = pageNo - (length / 2);
+
+			if (begin < first) {
+				begin = first;
+			}
+
+			int end = begin + length - 1;
+
+			if (end >= last) {
+				end = last;
+				begin = end - length + 1;
+				if (begin < first) {
+					begin = first;
+				}
+			}
+
+			if (begin > first) {
+				int i = 0;
+				for (i = first; i < first + slider && i < begin; i++) {
+					sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+							+ (i + 1 - first) + "</a></li>\n");
+				}
+				if (i < begin) {
+					sb.append("<li class=\"disabled\"><a href=\"javascript:\">...</a></li>\n");
+				}
+			}
+
+			for (int i = begin; i <= end; i++) {
+				if (i == pageNo) {
+					sb.append("<li class=\"active\"><a href=\"javascript:\">" + (i + 1 - first)
+							+ "</a></li>\n");
+				} else {
+					sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+							+ (i + 1 - first) + "</a></li>\n");
+				}
+			}
+
+			if (last - end > slider) {
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">...</a></li>\n");
+				end = last - slider;
+			}
+
+			for (int i = end + 1; i <= last; i++) {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+						+ (i + 1 - first) + "</a></li>\n");
+			}
+
+			if (pageNo == last) {
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+			} else {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+next+","+pageSize+",'"+funcParam+"');\">"
+						+ ""+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+			}
+
+			sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">"+requestContext.getMessage("current")+" ");
+			sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
+			sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");
+			sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n");
+
+			sb.insert(0,"<ul>\n").append("</ul>\n");
+			
+			sb.append("<div style=\"clear:both;\"></div>");
+
+//			sb.insert(0,"<div class=\"page\">\n").append("</div>\n");
+			
+		}else {
+		
 		if(list != null && list.isEmpty()&&pageNo<=1) {
 			return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
 		}
 		
 
-		StringBuilder sb = new StringBuilder();
 		
 		sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+first+","+pageSize+",'"+funcParam+"');\">"+requestContext.getMessage("firstPage")+"</a></li>\n");
 		if (pageNo == first) {// 如果是首页
@@ -335,7 +455,7 @@ public class PageLog<T> {
 		sb.insert(0,"<ul>\n").append("</ul>\n");
 		
 		sb.append("<div style=\"clear:both;\"></div>");
-
+		}
 		return sb.toString();
 	}
 	
@@ -413,7 +533,21 @@ public class PageLog<T> {
 		return first;
 	}
 
-
+	/**
+	 * 尾页索引
+	 * @return
+	 */
+	public int getLast() {
+		return last;
+	}
+	/**
+	 * 获取页面总数
+	 * @return getLast();
+	 */
+	@JsonIgnore
+	public int getTotalPage() {
+		return getLast();
+	}
 	/**
 	 * 是否为第一页
 	 * @return

src/main/java/com/nis/domain/callback/ProxyObjTrustedCa.java

@@ -0,0 +1,132 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class ProxyObjTrustedCa {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer certId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String certFile;
+	@Expose
+	private String certName;
+	@Expose
+	private Integer crlId; //crlId compileId crl使用
+	@Expose
+	private String crlFile;//crlFile crl使用
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCrlId() {
+		return crlId;
+	}
+	public void setCrlId(Integer crlId) {
+		this.crlId = crlId;
+	}
+	
+	
+	public Integer getCertId() {
+		return certId;
+	}
+	public void setCertId(Integer certId) {
+		this.certId = certId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	
+	public String getCertName() {
+		return certName;
+	}
+	public void setCertName(String certName) {
+		this.certName = certName;
+	}
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyObjTrustedCaCrl.java

@@ -0,0 +1,115 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class ProxyObjTrustedCaCrl {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Long certId; //cert compileId
+	@Expose
+	private Integer crlId; //cert compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String crlFile;
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCrlId() {
+		return crlId;
+	}
+	public void setCrlId(Integer crlId) {
+		this.crlId = crlId;
+	}
+	
+	public Long getCertId() {
+		return certId;
+	}
+	public void setCertId(Long certId) {
+		this.certId = certId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/configuration/AppFeatureIndex.java

@@ -29,7 +29,7 @@ public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
 	private static final long serialVersionUID = -8069201965300255275L;
 	private static final String tableName="app_feature_index";
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
-	@ExcelField(title="social_app",sort=2)
+	@ExcelField(title="social_app",sort=3)
 	private String appName;
 	private Integer specServiceId;
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code

src/main/java/com/nis/domain/configuration/AppStringFeatureCfg.java

@@ -26,28 +26,64 @@ public class AppStringFeatureCfg extends BaseCfg<AppStringFeatureCfg> {
 	private static final long serialVersionUID = 8677301658049443801L;
 	private static final String tableName="app_string_feature_cfg";
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	private Integer compileId;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
 	private String bytes;
+	@ExcelField(title="URL",sort=201)
 	private String cfgKeywords;
 	private String appName;
 
+	/**
+	 * 表达式类型
+	 */
 	@Expose
-	@ExcelField(title="expression_type")
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=202)
 	@SerializedName("exprType")
 	protected Integer exprType ;
-
+	/**
+	 * 匹配方式
+	 */
 	@Expose
-	@ExcelField(title="match_method")
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=203)
 	@SerializedName("matchMethod")
 	protected Integer matchMethod ;
-
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_hex",sort=204)
+	protected Integer isHex;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_case_insenstive",sort=205)
+	protected Integer isCaseInsenstive;
+	/**
+	 * 是否hex二进制
+	 */
 	@Expose
-	@ExcelField(title="whether_hexbinary")
 	@SerializedName("isHexbin")
 	protected Integer isHexbin;
+	
+	
+
+	public Integer getIsHex() {
+		return isHex;
+	}
+
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
 
 	public Integer getExprType() {
 		return exprType;

src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java

@@ -24,6 +24,7 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 	
 	private static final String tableName="app_topic_domain_cfg";
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	private Integer compileId;
 	@Expose
 	private String ratelimit;

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -72,7 +72,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * GK类型
 	 */
 	@Expose
-	@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
+	@ExcelField(title="block_type",dictType="SERVICE_ACTION",sort=2)
 	protected Integer action;
 	/**
 	 * 有效标识

src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java

@@ -0,0 +1,40 @@
+package com.nis.domain.configuration;
+
+
+/**
+ * 可信证书
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_cert";
+	private String issuer; //颁发者
+	private String certFile; 
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}

src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCrl.java

@@ -0,0 +1,49 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 吊销证书列表
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCrl extends BaseCfg<PxyObjTrustedCaCrl> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_crl";
+	private String issuer; //颁发者
+	private Integer certId; //证书Id 默认证书为空
+	private String crlFile; //crlFile
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCertId() {
+		return certId;
+	}
+	public void setCertId(Integer certId) {
+		this.certId = certId;
+	}
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}

src/main/java/com/nis/domain/log/NtcCollectVoipLog.java

@@ -0,0 +1,438 @@
+package com.nis.domain.log;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.BaseEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * 
+ * @ClassName:NtcCollectVoipLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author zdx
+ * @date 2018年11月5日 下午5:50:18
+ * @version V1.0
+ */
+public class NtcCollectVoipLog<T> extends BaseEntity<T> {
+
+	private static final long serialVersionUID = -2189520672838652485L;
+
+	@ApiModelProperty(value = "节目ID", required = true)
+	protected String pid;
+
+	@ApiModelProperty(value = "发现时间", required = true)
+	protected Date foundTime;
+	@ApiModelProperty(value = "接收时间", required = true)
+	protected Date recvTime;
+	@ApiModelProperty(value = "处理机IP", required = true)
+	protected String capIp;
+	@ApiModelProperty(value = "VOIP协议", required = true)
+	protected String voipProtocol;
+	@ApiModelProperty(value = "RTP服务端ip地址", required = true)
+	protected String rtpDIp;
+	@ApiModelProperty(value = "RTP客户端ip地址", required = true)
+	protected String rtpSIp;
+	@ApiModelProperty(value = "RTP服务端端口", required = true)
+	protected Integer rtpDPort;
+	@ApiModelProperty(value = "RTP客户端端口", required = true)
+	protected Integer rtpSPort;
+	@ApiModelProperty(value = "主叫VOIP语音文件存放服务器IP", required = true)
+	protected String fromToStoreIp;
+	@ApiModelProperty(value = "主叫VOIP语音文件存放服务器URL", required = true)
+	protected String fromToStoreUrl;
+	@ApiModelProperty(value = "被叫VOIP语音文件存放服务器IP", required = true)
+	protected String toFromStoreIp;
+	@ApiModelProperty(value = "被叫VOIP语音文件存放服务器URL", required = true)
+	protected String toFromStoreUrl;
+	@ApiModelProperty(value = "VOIP通话时长（秒）", required = true)
+	protected String duation;
+	@ApiModelProperty(value = "SIP服务端ip地址", required = true)
+	protected String sipDIp;
+	@ApiModelProperty(value = "SIP客户端ip地址", required = true)
+	protected String sipSIp;
+	@ApiModelProperty(value = "SIP服务端端口", required = true)
+	protected Integer sipDPort;
+	@ApiModelProperty(value = "SIP客户端端口", required = true)
+	protected Integer sipSPort;
+	@ApiModelProperty(value = "SIP会话ID", required = true)
+	protected String callId;
+	@ApiModelProperty(value = "SIP请求URI", required = true)
+	protected String requestUri;
+	@ApiModelProperty(value = "SIP主叫VOIP账号", required = true)
+	protected String callingAccount;
+	@ApiModelProperty(value = "SIP被叫VOIP账号", required = true)
+	protected String calledAccount;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String contacts;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String via;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String route;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String recordRoute;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String userAgent;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String server;
+	
+	
+	protected Integer functionId;
+	protected Integer action;
+	
+	protected String date;//配置界面日志总量查询时间
+	protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识
+	protected String orderBy;//排序参数
+	
+	protected String searchVoipProtocol;//协议类型
+	protected String searchRtpDIp;//RTP服务端ip
+	protected String searchRtpSIp;//RTP客户端ip
+	protected String searchSipDIp;//SIP服务端ip
+	protected String searchSipSIp;//SIP客户端ip
+	protected String searchCapIp;//处理机IP
+	protected String searchFoundStartTime;//开始发现时间
+	protected String searchFoundEndTime;//结束发现时间
+	
+	public NtcCollectVoipLog() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @return the voipProtocol
+	 */
+	public String getVoipProtocol() {
+		return voipProtocol;
+	}
+
+	/**
+	 * @param voipProtocol
+	 *            the voipProtocol to set
+	 */
+	public void setVoipProtocol(String voipProtocol) {
+		this.voipProtocol = voipProtocol;
+	}
+
+	public String getDuation() {
+		return duation;
+	}
+
+	public void setDuation(String duation) {
+		this.duation = duation;
+	}
+
+	public String getCallingAccount() {
+		return callingAccount;
+	}
+
+	public void setCallingAccount(String callingAccount) {
+		this.callingAccount = callingAccount;
+	}
+
+	public String getCalledAccount() {
+		return calledAccount;
+	}
+
+	public void setCalledAccount(String calledAccount) {
+		this.calledAccount = calledAccount;
+	}
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	public Date getFoundTime() {
+		return foundTime;
+	}
+
+	public void setFoundTime(Date foundTime) {
+		this.foundTime = foundTime;
+	}
+
+	public Date getRecvTime() {
+		return recvTime;
+	}
+
+	public void setRecvTime(Date recvTime) {
+		this.recvTime = recvTime;
+	}
+
+	public String getCapIp() {
+		return capIp;
+	}
+
+	public void setCapIp(String capIp) {
+		this.capIp = capIp;
+	}
+
+	public String getRtpDIp() {
+		return rtpDIp;
+	}
+
+	public void setRtpDIp(String rtpDIp) {
+		this.rtpDIp = rtpDIp;
+	}
+
+	public String getRtpSIp() {
+		return rtpSIp;
+	}
+
+	public void setRtpSIp(String rtpSIp) {
+		this.rtpSIp = rtpSIp;
+	}
+
+	public Integer getRtpDPort() {
+		return rtpDPort;
+	}
+
+	public void setRtpDPort(Integer rtpDPort) {
+		this.rtpDPort = rtpDPort;
+	}
+
+	public Integer getRtpSPort() {
+		return rtpSPort;
+	}
+
+	public void setRtpSPort(Integer rtpSPort) {
+		this.rtpSPort = rtpSPort;
+	}
+
+	public String getFromToStoreIp() {
+		return fromToStoreIp;
+	}
+
+	public void setFromToStoreIp(String fromToStoreIp) {
+		this.fromToStoreIp = fromToStoreIp;
+	}
+
+	public String getFromToStoreUrl() {
+		return fromToStoreUrl;
+	}
+
+	public void setFromToStoreUrl(String fromToStoreUrl) {
+		this.fromToStoreUrl = fromToStoreUrl;
+	}
+
+	public String getToFromStoreIp() {
+		return toFromStoreIp;
+	}
+
+	public void setToFromStoreIp(String toFromStoreIp) {
+		this.toFromStoreIp = toFromStoreIp;
+	}
+
+	public String getToFromStoreUrl() {
+		return toFromStoreUrl;
+	}
+
+	public void setToFromStoreUrl(String toFromStoreUrl) {
+		this.toFromStoreUrl = toFromStoreUrl;
+	}
+
+	public String getSipDIp() {
+		return sipDIp;
+	}
+
+	public void setSipDIp(String sipDIp) {
+		this.sipDIp = sipDIp;
+	}
+
+	public String getSipSIp() {
+		return sipSIp;
+	}
+
+	public void setSipSIp(String sipSIp) {
+		this.sipSIp = sipSIp;
+	}
+
+	public Integer getSipDPort() {
+		return sipDPort;
+	}
+
+	public void setSipDPort(Integer sipDPort) {
+		this.sipDPort = sipDPort;
+	}
+
+	public Integer getSipSPort() {
+		return sipSPort;
+	}
+
+	public void setSipSPort(Integer sipSPort) {
+		this.sipSPort = sipSPort;
+	}
+
+	public String getCallId() {
+		return callId;
+	}
+
+	public void setCallId(String callId) {
+		this.callId = callId;
+	}
+
+	public String getRequestUri() {
+		return requestUri;
+	}
+
+	public void setRequestUri(String requestUri) {
+		this.requestUri = requestUri;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getVia() {
+		return via;
+	}
+
+	public void setVia(String via) {
+		this.via = via;
+	}
+
+	public String getRoute() {
+		return route;
+	}
+
+	public void setRoute(String route) {
+		this.route = route;
+	}
+
+	public String getRecordRoute() {
+		return recordRoute;
+	}
+
+	public void setRecordRoute(String recordRoute) {
+		this.recordRoute = recordRoute;
+	}
+
+	public String getUserAgent() {
+		return userAgent;
+	}
+
+	public void setUserAgent(String userAgent) {
+		this.userAgent = userAgent;
+	}
+
+	public String getServer() {
+		return server;
+	}
+
+	public void setServer(String server) {
+		this.server = server;
+	}
+	@JsonIgnore
+	public String getSearchVoipProtocol() {
+		return searchVoipProtocol;
+	}
+
+	public void setSearchVoipProtocol(String searchVoipProtocol) {
+		this.searchVoipProtocol = searchVoipProtocol;
+	}
+	@JsonIgnore
+	public String getSearchRtpDIp() {
+		return searchRtpDIp;
+	}
+
+	public void setSearchRtpDIp(String searchRtpDIp) {
+		this.searchRtpDIp = searchRtpDIp;
+	}
+	@JsonIgnore
+	public String getSearchRtpSIp() {
+		return searchRtpSIp;
+	}
+
+	public void setSearchRtpSIp(String searchRtpSIp) {
+		this.searchRtpSIp = searchRtpSIp;
+	}
+	@JsonIgnore
+	public String getSearchSipDIp() {
+		return searchSipDIp;
+	}
+
+	public void setSearchSipDIp(String searchSipDIp) {
+		this.searchSipDIp = searchSipDIp;
+	}
+	
+	public String getSearchSipSIp() {
+		return searchSipSIp;
+	}
+
+	public void setSearchSipSIp(String searchSipSIp) {
+		this.searchSipSIp = searchSipSIp;
+	}
+
+	@JsonIgnore
+	public String getSearchCapIp() {
+		return searchCapIp;
+	}
+
+	public void setSearchCapIp(String searchCapIp) {
+		this.searchCapIp = searchCapIp;
+	}
+	@JsonIgnore
+	public String getSearchFoundStartTime() {
+		return searchFoundStartTime;
+	}
+
+	public void setSearchFoundStartTime(String searchFoundStartTime) {
+		this.searchFoundStartTime = searchFoundStartTime;
+	}
+
+	@JsonIgnore
+	public String getSearchFoundEndTime() {
+		return searchFoundEndTime;
+	}
+
+	public void setSearchFoundEndTime(String searchFoundEndTime) {
+		this.searchFoundEndTime = searchFoundEndTime;
+	}
+
+	public Integer getFunctionId() {
+		return functionId;
+	}
+
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+
+	public Integer getAction() {
+		return action;
+	}
+
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+
+	public String getDate() {
+		return date;
+	}
+
+	public void setDate(String date) {
+		this.date = date;
+	}
+
+	public String getIsLogTotalSearch() {
+		return isLogTotalSearch;
+	}
+
+	public void setIsLogTotalSearch(String isLogTotalSearch) {
+		this.isLogTotalSearch = isLogTotalSearch;
+	}
+
+	public String getOrderBy() {
+		return orderBy;
+	}
+
+	public void setOrderBy(String orderBy) {
+		this.orderBy = orderBy;
+	}
+	
+}