gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、增加Radius泛收日志查询接口；

Browse Source 
2、VoIp泛收日志Bean中日期格式数据get方法添加@JsonSerialize注解
This commit is contained in:
zhangdongxu
2018-12-12 15:58:45 +08:00
parent 8e3270d4be
commit 66e965f76c
7 changed files with 557 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/com/nis/domain/restful/NtcCollectRadiusLog.java Normal file
View File

@@ -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;
}
}

861
src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
View File

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

35
src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
View File

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.restful.NtcAppLog; import com.nis.domain.restful.NtcAppLog;
import com.nis.domain.restful.NtcBgpLog; import com.nis.domain.restful.NtcBgpLog;
import com.nis.domain.restful.NtcCollectRadiusLog;
import com.nis.domain.restful.NtcCollectVoipLog; import com.nis.domain.restful.NtcCollectVoipLog;
import com.nis.domain.restful.NtcDdosLog; import com.nis.domain.restful.NtcDdosLog;
import com.nis.domain.restful.NtcDnsLog; import com.nis.domain.restful.NtcDnsLog;
@@ -584,4 +585,38 @@ public class NtcLogSearchController extends BaseRestController {
return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VoIp泛收日志检索成功", page, return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VoIp泛收日志检索成功", page,
0); 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);
}
} }

36
src/main/java/com/nis/web/dao/DfLogSearchDao.xml
View File

@@ -1434,4 +1434,40 @@
<result column="user_agent" jdbcType="VARCHAR" property="userAgent" /> <result column="user_agent" jdbcType="VARCHAR" property="userAgent" />
<result column="server" jdbcType="VARCHAR" property="server" /> <result column="server" jdbcType="VARCHAR" property="server" />
</resultMap> </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> </mapper>

2
src/main/resources/applicationLog-clickhouse.properties
View File

@@ -36,7 +36,7 @@ NtcStreamingMediaLogClickHouseTable=TBS_ODS_NTC_STREAMING_MEDIA_LOG
MmFileDigestLogClickHouseTable=TBS_ODS_MM_FILE_DIGEST_LOG MmFileDigestLogClickHouseTable=TBS_ODS_MM_FILE_DIGEST_LOG
NtcKeywordsUrlLogClickHouseTable=TBS_ODS_NTC_KEYWORDS_URL_LOG NtcKeywordsUrlLogClickHouseTable=TBS_ODS_NTC_KEYWORDS_URL_LOG
NtcCollectVoipLogClickHouseTable=TBS_ODS_NTC_COLLECT_VOIP_LOG NtcCollectVoipLogClickHouseTable=TBS_ODS_NTC_COLLECT_VOIP_LOG
NtcCollectRadiusLogClickHouseTable=TBS_ODS_NTC_COLLECT_RADIUS_LOG

2
src/main/resources/applicationLog-hive.properties
View File

@@ -36,7 +36,7 @@ NtcStreamingMediaLogHiveTable=NTC_STREAMING_MEDIA_LOG
MmFileDigestLogHiveTable=MM_FILE_DIGEST_LOG MmFileDigestLogHiveTable=MM_FILE_DIGEST_LOG
NtcKeywordsUrlLogHiveTable=NTC_KEYWORDS_URL_LOG NtcKeywordsUrlLogHiveTable=NTC_KEYWORDS_URL_LOG
NtcCollectVoipLogHiveTable=NTC_COLLECT_VOIP_LOG NtcCollectVoipLogHiveTable=NTC_COLLECT_VOIP_LOG
NtcCollectRadiusLogHiveTable=NTC_COLLECT_RADIUS_LOG

2
src/main/resources/applicationLog-hive.properties.xinghan
View File

@@ -36,7 +36,7 @@ NtcStreamingMediaLogHiveTable=singhand_NTC_STREAMING_MEDIA_LOG
MmFileDigestLogHiveTable=singhand_MM_FILE_DIGEST_LOG MmFileDigestLogHiveTable=singhand_MM_FILE_DIGEST_LOG
NtcKeywordsUrlLogHiveTable=singhand_NTC_KEYWORDS_URL_LOG NtcKeywordsUrlLogHiveTable=singhand_NTC_KEYWORDS_URL_LOG
NtcCollectVoipLogHiveTable=singhand_NTC_COLLECT_VOIP_LOG NtcCollectVoipLogHiveTable=singhand_NTC_COLLECT_VOIP_LOG
NtcCollectRadiusLogHiveTable=singhand_NTC_COLLECT_RADIUS_LOG