diff --git a/src/main/java/com/nis/domain/restful/NtcCollectRadiusLog.java b/src/main/java/com/nis/domain/restful/NtcCollectRadiusLog.java
new file mode 100644
index 0000000..1c314f8
--- /dev/null
+++ b/src/main/java/com/nis/domain/restful/NtcCollectRadiusLog.java
@@ -0,0 +1,51 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * 
+ * 	@ClassName:NtcCollectRadiusLog
+ * 	@Description:TODO(这里用一句话描述这个类的作用)
+ *	@author zdx
+ *	@date 2018年12月12日 下午2:00:16
+ *	@version V1.0
+ */
+public class NtcCollectRadiusLog  extends LogEntity<NtcCollectRadiusLog> {
+	
+	private static final long serialVersionUID = 6757490542745612556L;
+	@ApiModelProperty(value="报文类型", required=true)
+    protected Integer code;
+    @ApiModelProperty(value="ISN接入的IP", required=true)
+    protected String nasIp;
+    @ApiModelProperty(value="服务器下发的用户地址", required=true)
+    protected String framedIp;
+    @ApiModelProperty(value="用户名", required=true)
+    protected String account;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getNasIp() {
+		return nasIp;
+	}
+	public void setNasIp(String nasIp) {
+		this.nasIp = nasIp;
+	}
+	public String getFramedIp() {
+		return framedIp;
+	}
+	public void setFramedIp(String framedIp) {
+		this.framedIp = framedIp;
+	}
+	public String getAccount() {
+		return account;
+	}
+	public void setAccount(String account) {
+		this.account = account;
+	}
+	
+    
+}
diff --git a/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java b/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
index 40fb393..e20fae5 100644
--- a/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
+++ b/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
@@ -1,429 +1,432 @@
-package com.nis.domain.restful;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.nis.domain.LogEntity;
-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 implements Serializable{
-
-	private static final long serialVersionUID = -8215121930207772717L;
-
-	@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 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(String pid, Date foundTime, Date recvTime,
-			String capIp, String voipProtocol, String rtpDIp, String rtpSIp,
-			Integer rtpDPort, Integer rtpSPort, String fromToStoreIp,
-			String fromToStoreUrl, String toFromStoreIp, String toFromStoreUrl,
-			String duation, String sipDIp, String sipSIp, Integer sipDPort,
-			Integer sipSPort, String callId, String requestUri,
-			String callingAccount, String calledAccount, String contacts,
-			String via, String route, String recordRoute, String userAgent,
-			String server) {
-		super();
-		this.pid = pid;
-		this.foundTime = foundTime;
-		this.recvTime = recvTime;
-		this.capIp = capIp;
-		this.voipProtocol = voipProtocol;
-		this.rtpDIp = rtpDIp;
-		this.rtpSIp = rtpSIp;
-		this.rtpDPort = rtpDPort;
-		this.rtpSPort = rtpSPort;
-		this.fromToStoreIp = fromToStoreIp;
-		this.fromToStoreUrl = fromToStoreUrl;
-		this.toFromStoreIp = toFromStoreIp;
-		this.toFromStoreUrl = toFromStoreUrl;
-		this.duation = duation;
-		this.sipDIp = sipDIp;
-		this.sipSIp = sipSIp;
-		this.sipDPort = sipDPort;
-		this.sipSPort = sipSPort;
-		this.callId = callId;
-		this.requestUri = requestUri;
-		this.callingAccount = callingAccount;
-		this.calledAccount = calledAccount;
-		this.contacts = contacts;
-		this.via = via;
-		this.route = route;
-		this.recordRoute = recordRoute;
-		this.userAgent = userAgent;
-		this.server = server;
-	}
-
-	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;
-	}
-	@JsonIgnore
-	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;
-	}
-}
+package com.nis.domain.restful;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.nis.util.JsonDateSerializer;
+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 implements Serializable{
+
+	private static final long serialVersionUID = -8215121930207772717L;
+
+	@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 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(String pid, Date foundTime, Date recvTime,
+			String capIp, String voipProtocol, String rtpDIp, String rtpSIp,
+			Integer rtpDPort, Integer rtpSPort, String fromToStoreIp,
+			String fromToStoreUrl, String toFromStoreIp, String toFromStoreUrl,
+			String duation, String sipDIp, String sipSIp, Integer sipDPort,
+			Integer sipSPort, String callId, String requestUri,
+			String callingAccount, String calledAccount, String contacts,
+			String via, String route, String recordRoute, String userAgent,
+			String server) {
+		super();
+		this.pid = pid;
+		this.foundTime = foundTime;
+		this.recvTime = recvTime;
+		this.capIp = capIp;
+		this.voipProtocol = voipProtocol;
+		this.rtpDIp = rtpDIp;
+		this.rtpSIp = rtpSIp;
+		this.rtpDPort = rtpDPort;
+		this.rtpSPort = rtpSPort;
+		this.fromToStoreIp = fromToStoreIp;
+		this.fromToStoreUrl = fromToStoreUrl;
+		this.toFromStoreIp = toFromStoreIp;
+		this.toFromStoreUrl = toFromStoreUrl;
+		this.duation = duation;
+		this.sipDIp = sipDIp;
+		this.sipSIp = sipSIp;
+		this.sipDPort = sipDPort;
+		this.sipSPort = sipSPort;
+		this.callId = callId;
+		this.requestUri = requestUri;
+		this.callingAccount = callingAccount;
+		this.calledAccount = calledAccount;
+		this.contacts = contacts;
+		this.via = via;
+		this.route = route;
+		this.recordRoute = recordRoute;
+		this.userAgent = userAgent;
+		this.server = server;
+	}
+
+	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;
+	}
+
+	@JsonSerialize(using = JsonDateSerializer.class)
+	public Date getFoundTime() {
+		return foundTime;
+	}
+
+	public void setFoundTime(Date foundTime) {
+		this.foundTime = foundTime;
+	}
+
+	@JsonSerialize(using = JsonDateSerializer.class)
+	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;
+	}
+	@JsonIgnore
+	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;
+	}
+}
diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
index b57499a..9f88245 100644
--- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
+++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.nis.domain.Page;
 import com.nis.domain.restful.NtcAppLog;
 import com.nis.domain.restful.NtcBgpLog;
+import com.nis.domain.restful.NtcCollectRadiusLog;
 import com.nis.domain.restful.NtcCollectVoipLog;
 import com.nis.domain.restful.NtcDdosLog;
 import com.nis.domain.restful.NtcDnsLog;
@@ -584,4 +585,38 @@ public class NtcLogSearchController extends BaseRestController {
 		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VoIp泛收日志检索成功", page,
 				0);
 	}
+	
+	@RequestMapping(value = "/ntcCollectRadiusLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "RADIUS泛收日志查询", httpMethod = "GET", notes = "对日志功能“RADIUS泛收日志查询”提供数据基础查询服务")
+	public Map<String, ?> ntcCollectRadiusLogs(Page page, NtcCollectRadiusLog ntcCollectRadiusLog, Model model,
+			HttpServletRequest request, HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request,
+				null);
+
+		try {
+			if (StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundStartTime())
+					&& StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundEndTime())) {
+				Map<String, String> map = DateUtils.getLocalTime(null,
+						null, Constants.LOG_LOCAL_TIME, "minute");
+				ntcCollectRadiusLog.setSearchFoundStartTime(map.get("startTime"));
+				ntcCollectRadiusLog.setSearchFoundEndTime(map.get("endTime"));
+			}
+			
+			ntcLogService.queryConditionCheck(auditLogThread, start,ntcCollectRadiusLog, NtcCollectRadiusLog.class, page);
+			logDataService.getData(page, ntcCollectRadiusLog);
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(ExceptionUtil.getExceptionMsg(e));
+			if (!(e instanceof RestServiceException)) {
+				throw new ServiceRuntimeException(auditLogThread, System.currentTimeMillis() - start,
+						"RADIUS泛收日志检索失败:" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue());
+			}else{
+				throw ((RestServiceException) e);
+			}
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "RADIUS泛收日志检索成功", page,
+				0);
+	}
 }
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
index 257327e..4faca4f 100644
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -1434,4 +1434,40 @@
 		<result column="user_agent" jdbcType="VARCHAR" property="userAgent" />
 		<result column="server" jdbcType="VARCHAR" property="server" />
 	</resultMap>
+	
+	<resultMap id="NtcCollectRadiusLogMap" type="com.nis.domain.restful.NtcCollectRadiusLog">
+		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
+		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
+		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
+		<result column="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="s_subscribe_id" jdbcType="VARCHAR" property="sSubscribeId" />
+		<result column="d_subscribe_id" jdbcType="VARCHAR" property="dSubscribeId" />
+		<result column="scene_file" jdbcType="VARCHAR" property="sceneFile" />
+		<result column="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
+		
+		<result column="code" jdbcType="INTEGER" property="code" />
+		<result column="nas_ip" jdbcType="VARCHAR" property="nasIp" />
+		<result column="framed_ip" jdbcType="VARCHAR" property="framedIp" />
+		<result column="account" jdbcType="VARCHAR" property="account" />
+	</resultMap>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/applicationLog-clickhouse.properties b/src/main/resources/applicationLog-clickhouse.properties
index 2c99a1c..795b9d6 100644
--- a/src/main/resources/applicationLog-clickhouse.properties
+++ b/src/main/resources/applicationLog-clickhouse.properties
@@ -36,7 +36,7 @@ NtcStreamingMediaLogClickHouseTable=TBS_ODS_NTC_STREAMING_MEDIA_LOG
 MmFileDigestLogClickHouseTable=TBS_ODS_MM_FILE_DIGEST_LOG
 NtcKeywordsUrlLogClickHouseTable=TBS_ODS_NTC_KEYWORDS_URL_LOG
 NtcCollectVoipLogClickHouseTable=TBS_ODS_NTC_COLLECT_VOIP_LOG
-
+NtcCollectRadiusLogClickHouseTable=TBS_ODS_NTC_COLLECT_RADIUS_LOG
 
 
 
diff --git a/src/main/resources/applicationLog-hive.properties b/src/main/resources/applicationLog-hive.properties
index 1668ad4..9468bab 100644
--- a/src/main/resources/applicationLog-hive.properties
+++ b/src/main/resources/applicationLog-hive.properties
@@ -36,7 +36,7 @@ NtcStreamingMediaLogHiveTable=NTC_STREAMING_MEDIA_LOG
 MmFileDigestLogHiveTable=MM_FILE_DIGEST_LOG
 NtcKeywordsUrlLogHiveTable=NTC_KEYWORDS_URL_LOG
 NtcCollectVoipLogHiveTable=NTC_COLLECT_VOIP_LOG
-
+NtcCollectRadiusLogHiveTable=NTC_COLLECT_RADIUS_LOG
 
 
 
diff --git a/src/main/resources/applicationLog-hive.properties.xinghan b/src/main/resources/applicationLog-hive.properties.xinghan
index b711c91..6d82eac 100644
--- a/src/main/resources/applicationLog-hive.properties.xinghan
+++ b/src/main/resources/applicationLog-hive.properties.xinghan
@@ -36,7 +36,7 @@ NtcStreamingMediaLogHiveTable=singhand_NTC_STREAMING_MEDIA_LOG
 MmFileDigestLogHiveTable=singhand_MM_FILE_DIGEST_LOG
 NtcKeywordsUrlLogHiveTable=singhand_NTC_KEYWORDS_URL_LOG
 NtcCollectVoipLogHiveTable=singhand_NTC_COLLECT_VOIP_LOG
-
+NtcCollectRadiusLogHiveTable=singhand_NTC_COLLECT_RADIUS_LOG