diff --git a/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java b/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java new file mode 100644 index 0000000..bd57bf6 --- /dev/null +++ b/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java @@ -0,0 +1,83 @@ +package com.nis.domain.restful; + +import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +/** + * + * @ClassName:NtcConnRecordLog + * @Description:TODO(这里用一句话描述这个类的作用) + * @author rkg + * @date 2018年12月12日 下午2:00:16 + * @version V1.0 + */ +public class NtcConnRecordPercent implements Serializable { + + private String bps; + private String bpsPercent; + private String pps; + private String ppsPercent; + private String searchFoundStartTime;// 开始发现时间 + private String searchFoundEndTime;// 结束发现时间 + private String searchStreamDir;// 流类型 + + public String getBps() { + return bps; + } + + public void setBps(String bps) { + this.bps = bps; + } + + public String getBpsPercent() { + return bpsPercent; + } + + public void setBpsPercent(String bpsPercent) { + this.bpsPercent = bpsPercent; + } + + public String getPps() { + return pps; + } + + public void setPps(String pps) { + this.pps = pps; + } + + public String getPpsPercent() { + return ppsPercent; + } + + public void setPpsPercent(String ppsPercent) { + this.ppsPercent = ppsPercent; + } + + @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; + } + + @JsonIgnore + public String getSearchStreamDir() { + return searchStreamDir; + } + + public void setSearchStreamDir(String searchStreamDir) { + this.searchStreamDir = searchStreamDir; + } +} 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 5182d85..6b0c826 100644 --- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java @@ -1,5 +1,7 @@ package com.nis.web.controller.restful; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -17,6 +19,7 @@ import com.nis.domain.restful.NtcBgpLog; import com.nis.domain.restful.NtcCollectRadiusLog; import com.nis.domain.restful.NtcCollectVoipLog; import com.nis.domain.restful.NtcConnRecordLog; +import com.nis.domain.restful.NtcConnRecordPercent; import com.nis.domain.restful.NtcDdosLog; import com.nis.domain.restful.NtcDnsLog; import com.nis.domain.restful.NtcFtpLog; @@ -79,8 +82,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpLog, NtcIpLog.class, page); logDataService.getData(page, ntcIpLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("IP地址日志检索失败:"+e.getMessage()); - logger.error("IP地址日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("IP地址日志检索失败:" + e.getMessage()); + logger.error("IP地址日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "IP地址日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -91,7 +94,7 @@ public class NtcLogSearchController extends BaseRestController { throw new ServiceRuntimeException(auditLogThread, System.currentTimeMillis() - start, "IP地址日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue()); } - + } return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "IP地址日志检索成功", page, 0); } @@ -109,8 +112,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcHttpLog, NtcHttpLog.class, page); logDataService.getData(page, ntcHttpLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("Http日志检索失败:"+e.getMessage()); - logger.error("Http日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("Http日志检索失败:" + e.getMessage()); + logger.error("Http日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "Http日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -139,8 +142,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcDnsLog, NtcDnsLog.class, page); logDataService.getData(page, ntcDnsLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("Dns日志检索失败:"+e.getMessage()); - logger.error("Dns日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("Dns日志检索失败:" + e.getMessage()); + logger.error("Dns日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "Dns日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -168,8 +171,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcMailLog, NtcMailLog.class, page); logDataService.getData(page, ntcMailLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("EMAIL日志检索失败:"+e.getMessage()); - logger.error("EMAIL日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("EMAIL日志检索失败:" + e.getMessage()); + logger.error("EMAIL日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "EMAIL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -198,8 +201,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcSslLog, NtcSslLog.class, page); logDataService.getData(page, ntcSslLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("SSL日志检索失败:"+e.getMessage()); - logger.error("SSL日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("SSL日志检索失败:" + e.getMessage()); + logger.error("SSL日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "SSL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -228,8 +231,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcPptpLog, NtcPptpLog.class, page); logDataService.getData(page, ntcPptpLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("PPTP日志检索失败:"+e.getMessage()); - logger.error("PPTP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("PPTP日志检索失败:" + e.getMessage()); + logger.error("PPTP日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "PPTP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -258,8 +261,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcL2tpLog, NtcL2tpLog.class, page); logDataService.getData(page, ntcL2tpLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("L2TP日志检索失败:"+e.getMessage()); - logger.error("L2TP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("L2TP日志检索失败:" + e.getMessage()); + logger.error("L2TP日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "L2TP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -288,8 +291,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcOpenvpnLog, NtcOpenvpnLog.class, page); logDataService.getData(page, ntcOpenvpnLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("Openvpn日志检索失败:"+e.getMessage()); - logger.error("Openvpn日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("Openvpn日志检索失败:" + e.getMessage()); + logger.error("Openvpn日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "Openvpn日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -319,8 +322,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpsecLog, NtcIpsecLog.class, page); logDataService.getData(page, ntcIpsecLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("IPSEC日志检索失败:"+e.getMessage()); - logger.error("IPSEC日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("IPSEC日志检索失败:" + e.getMessage()); + logger.error("IPSEC日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "IPSEC日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -349,8 +352,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcSshLog, NtcSshLog.class, page); logDataService.getData(page, ntcSshLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("SSH日志检索失败:"+e.getMessage()); - logger.error("SSH日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("SSH日志检索失败:" + e.getMessage()); + logger.error("SSH日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "SSH日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -381,8 +384,8 @@ public class NtcLogSearchController extends BaseRestController { logDataService.getData(page, ntcFtpLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("FTP日志检索失败:"+e.getMessage()); - logger.error("FTP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("FTP日志检索失败:" + e.getMessage()); + logger.error("FTP日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "FTP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -409,8 +412,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcAppLog, NtcAppLog.class, page); logDataService.getData(page, ntcAppLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("App日志检索失败:"+e.getMessage()); - logger.error("App日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("App日志检索失败:" + e.getMessage()); + logger.error("App日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "App日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -438,8 +441,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcDdosLog, NtcDdosLog.class, page); logDataService.getData(page, ntcDdosLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("DDos日志检索失败:"+e.getMessage()); - logger.error("DDos日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("DDos日志检索失败:" + e.getMessage()); + logger.error("DDos日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "DDos日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -468,8 +471,8 @@ public class NtcLogSearchController extends BaseRestController { logDataService.getData(page, ntcP2pLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("P2P日志检索失败:"+e.getMessage()); - logger.error("P2P日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("P2P日志检索失败:" + e.getMessage()); + logger.error("P2P日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "P2P日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -498,8 +501,8 @@ public class NtcLogSearchController extends BaseRestController { logDataService.getData(page, ntcBgpLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("BGP日志检索失败:"+e.getMessage()); - logger.error("BGP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("BGP日志检索失败:" + e.getMessage()); + logger.error("BGP日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "BGP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -527,8 +530,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcVoipLog, NtcVoipLog.class, page); logDataService.getData(page, ntcVoipLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("NTC VoIP日志检索失败:"+e.getMessage()); - logger.error("NTC VoIP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("NTC VoIP日志检索失败:" + e.getMessage()); + logger.error("NTC VoIP日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "NTC VoIP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -558,8 +561,8 @@ public class NtcLogSearchController extends BaseRestController { page); logDataService.getData(page, ntcStreamMediaLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("流媒体协议日志检索失败:"+e.getMessage()); - logger.error("流媒体协议日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("流媒体协议日志检索失败:" + e.getMessage()); + logger.error("流媒体协议日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "流媒体协议日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -587,8 +590,8 @@ public class NtcLogSearchController extends BaseRestController { ntcLogService.queryConditionCheck(auditLogThread, start, ntcKeywordsUrlLog, NtcKeywordsUrlLog.class, page); logDataService.getData(page, ntcKeywordsUrlLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("NTC关键字转URL日志检索失败:"+e.getMessage()); - logger.error("NTC关键字转URL日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("NTC关键字转URL日志检索失败:" + e.getMessage()); + logger.error("NTC关键字转URL日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "NTC关键字转URL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -615,17 +618,17 @@ public class NtcLogSearchController extends BaseRestController { try { if (StringUtil.isEmpty(ntcCollectVoipLog.getSearchFoundStartTime()) && StringUtil.isEmpty(ntcCollectVoipLog.getSearchFoundEndTime())) { - Map map = DateUtils.getLocalTime(null, - null, Constants.LOG_LOCAL_TIME, "minute"); + Map map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute"); ntcCollectVoipLog.setSearchFoundStartTime(map.get("startTime")); ntcCollectVoipLog.setSearchFoundEndTime(map.get("endTime")); } - - ntcLogService.collectConditionCheck(auditLogThread, start,ntcCollectVoipLog, NtcCollectVoipLog.class, page); + + ntcLogService.collectConditionCheck(auditLogThread, start, ntcCollectVoipLog, NtcCollectVoipLog.class, + page); logDataService.getData(page, ntcCollectVoipLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("VoIp泛收日志检索失败:"+e.getMessage()); - logger.error("VoIp泛收日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("VoIp泛收日志检索失败:" + e.getMessage()); + logger.error("VoIp泛收日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "VoIp泛收日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -637,10 +640,9 @@ public class NtcLogSearchController extends BaseRestController { "VoIp泛收日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue()); } } - return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VoIp泛收日志检索成功", page, - 0); + 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 ntcCollectRadiusLogs(Page page, NtcCollectRadiusLog ntcCollectRadiusLog, Model model, @@ -652,17 +654,17 @@ public class NtcLogSearchController extends BaseRestController { try { if (StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundStartTime()) && StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundEndTime())) { - Map map = DateUtils.getLocalTime(null, - null, Constants.LOG_LOCAL_TIME, "minute"); + Map 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); + + ntcLogService.queryConditionCheck(auditLogThread, start, ntcCollectRadiusLog, NtcCollectRadiusLog.class, + page); logDataService.getData(page, ntcCollectRadiusLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("RADIUS泛收日志检索失败:"+e.getMessage()); - logger.error("RADIUS泛收日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("RADIUS泛收日志检索失败:" + e.getMessage()); + logger.error("RADIUS泛收日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "RADIUS泛收日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -677,7 +679,6 @@ public class NtcLogSearchController extends BaseRestController { return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "RADIUS泛收日志检索成功", page, 0); } - @RequestMapping(value = "/ntcConnRecordLogs", method = RequestMethod.GET) @ApiOperation(value = "通联关系日志查询", httpMethod = "GET", notes = "对日志功能“通联关系日志查询”提供数据基础查询服务") @@ -689,16 +690,15 @@ public class NtcLogSearchController extends BaseRestController { try { if (StringUtil.isEmpty(ntcConnRecordLog.getSearchFoundStartTime()) && StringUtil.isEmpty(ntcConnRecordLog.getSearchFoundEndTime())) { - Map map = DateUtils.getLocalTime(null, - null, Constants.LOG_LOCAL_TIME, "minute"); + Map map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute"); ntcConnRecordLog.setSearchFoundStartTime(map.get("startTime")); ntcConnRecordLog.setSearchFoundEndTime(map.get("endTime")); } - ntcLogService.queryConditionCheck(auditLogThread, start,ntcConnRecordLog, NtcConnRecordLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcConnRecordLog, NtcConnRecordLog.class, page); logDataService.getData(page, ntcConnRecordLog); } catch (Exception e) { - auditLogThread.setExceptionInfo("通联关系日志检索失败:"+e.getMessage()); - logger.error("通联关系日志检索失败："+ExceptionUtil.getExceptionMsg(e)); + auditLogThread.setExceptionInfo("通联关系日志检索失败:" + e.getMessage()); + logger.error("通联关系日志检索失败：" + ExceptionUtil.getExceptionMsg(e)); if (e instanceof RestServiceException) { throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "通联关系日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); @@ -710,7 +710,73 @@ public class NtcLogSearchController extends BaseRestController { "通联关系日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue()); } } - return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "通联关系日志检索成功", page, - 0); + return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "通联关系日志检索成功", page, 0); + } + + @RequestMapping(value = "/ntcConnRecordPercent", method = RequestMethod.GET) + @ApiOperation(value = "通联关系日志百分比查询", httpMethod = "GET", notes = "对日志功能“通联关系日志百分比查询”提供数据基础查询服务") + public Map ntcConnRecordPercent(NtcConnRecordPercent ntcConnRecordPercent, Model model, + HttpServletRequest request, HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, + null); + try { + if (StringUtil.isEmpty(ntcConnRecordPercent.getSearchFoundStartTime()) + && StringUtil.isEmpty(ntcConnRecordPercent.getSearchFoundEndTime())) { + Map map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute"); + ntcConnRecordPercent.setSearchFoundStartTime(map.get("startTime")); + ntcConnRecordPercent.setSearchFoundEndTime(map.get("endTime")); + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + if (!StringUtil.isBlank(ntcConnRecordPercent.getSearchFoundEndTime())) { + sdf.setLenient(false); + sdf.parse(ntcConnRecordPercent.getSearchFoundEndTime()); + }else { + throw new RestServiceException("searchFoundEndTime参数不能为空", + RestBusinessCode.param_formate_error.getValue()); + } + } catch (ParseException e) { + throw new RestServiceException("searchFoundEndTime参数格式错误", + RestBusinessCode.param_formate_error.getValue()); + } catch (Exception e) { + throw new RestServiceException("searchFoundEndTime参数错误", + RestBusinessCode.param_formate_error.getValue()); + } + + try { + if (!StringUtil.isBlank(ntcConnRecordPercent.getSearchFoundStartTime())) { + sdf.setLenient(false); + sdf.parse(ntcConnRecordPercent.getSearchFoundStartTime()); + }else { + throw new RestServiceException("searchFoundStartTime参数不能为空", + RestBusinessCode.param_formate_error.getValue()); + } + } catch (ParseException e) { + throw new RestServiceException("searchFoundStartTime参数格式错误", + RestBusinessCode.param_formate_error.getValue()); + } catch (Exception e) { + throw new RestServiceException("searchFoundStartTime参数错误", + RestBusinessCode.param_formate_error.getValue()); + } + + logDataService.getNtcConnRecordPercent(ntcConnRecordPercent); + } catch (Exception e) { + auditLogThread.setExceptionInfo("通联关系日志检索失败:" + e.getMessage()); + logger.error("通联关系日志百分比检索失败：" + ExceptionUtil.getExceptionMsg(e)); + if (e instanceof RestServiceException) { + throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, + "通联关系日志百分比检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); + } else if (e instanceof ServiceRuntimeException) { + throw new ServiceRuntimeException(auditLogThread, System.currentTimeMillis() - start, + "通联关系日志百分比检索失败：" + e.getMessage(), ((ServiceRuntimeException) e).getErrorCode()); + } else { + throw new ServiceRuntimeException(auditLogThread, System.currentTimeMillis() - start, + "通联关系日志百分比检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue()); + } + } + return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "通联关系日志百分比检索成功", + ntcConnRecordPercent, 0); } } diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml index 165091f..d32dd3f 100644 --- a/src/main/java/com/nis/web/dao/NtcReportDao.xml +++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml @@ -623,7 +623,7 @@ - group by NAS_IP order by num desc limit 10; + group by NAS_IP order by num desc \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java b/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java index 3f199a8..73d5063 100644 --- a/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java +++ b/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java @@ -9,6 +9,7 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -24,7 +25,7 @@ import org.springframework.stereotype.Repository; import com.alibaba.druid.pool.DruidDataSource; import com.nis.domain.Page; -import com.nis.util.Constants; +import com.nis.domain.restful.NtcConnRecordPercent; import com.nis.web.service.SpringContextHolder; import com.zdjizhi.utils.StringUtil; @@ -110,6 +111,48 @@ public class LocalLogJDBCByDruid { } } + public NtcConnRecordPercent getNtcConnRecordPercentData(NtcConnRecordPercent ntcConnRecordPercent, String sql, + boolean isPersent) throws Exception { + try { + conn = getConnection(); + logger.info("连接数据中心日志库成功--------------------------"); + st = conn.createStatement(); + logger.info("开始执行日志查询语句sql={}", sql); + rs = st.executeQuery(sql); + NumberFormat num = NumberFormat.getPercentInstance(); + num.setMinimumFractionDigits(2);// 保留两位小数 + while (rs.next()) { + if (isPersent) { + String allBps = rs.getString("bps"); + if (!allBps.equals("0")) { + ntcConnRecordPercent.setBpsPercent( + num.format(Double.valueOf(ntcConnRecordPercent.getBps()) / Double.valueOf(allBps))); + ntcConnRecordPercent.setBps(num.format(Double.valueOf(ntcConnRecordPercent.getBps()))); + } else { + ntcConnRecordPercent.setBpsPercent("0%"); + } + String allPps = rs.getString("pps"); + if (!allPps.equals("0")) { + ntcConnRecordPercent.setPpsPercent( + num.format(Double.valueOf(ntcConnRecordPercent.getPps()) / Double.valueOf(allPps))); + ntcConnRecordPercent.setPps(num.format(Double.valueOf(ntcConnRecordPercent.getPps()))); + } else { + ntcConnRecordPercent.setPpsPercent("0%"); + } + } else { + String bps = rs.getString("bps"); + String pps = rs.getString("pps"); + ntcConnRecordPercent.setBps(bps); + ntcConnRecordPercent.setPps(pps); + } + } + logger.info("执行日志查询语句成功,sql={}", sql); + } finally { + closeConn(); + } + return ntcConnRecordPercent; + } + /** * 关闭数据库连接 */ diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java index 06867a9..9ed2494 100644 --- a/src/main/java/com/nis/web/service/LogDataService.java +++ b/src/main/java/com/nis/web/service/LogDataService.java @@ -2,6 +2,7 @@ package com.nis.web.service; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; @@ -18,6 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.nis.domain.Page; +import com.nis.domain.restful.NtcConnRecordPercent; +import com.nis.restful.RestBusinessCode; +import com.nis.restful.RestServiceException; import com.nis.util.Configurations; import com.nis.util.Constants; import com.nis.web.dao.impl.LocalLogJDBCByDruid; @@ -50,6 +54,34 @@ public class LogDataService { col2col.put("searchFoundEndTime", endMap); } + public NtcConnRecordPercent getNtcConnRecordPercent(NtcConnRecordPercent ntcConnRecordPercent) throws Exception { + + long startTime = sdf.parse(ntcConnRecordPercent.getSearchFoundStartTime().toString().trim()).getTime() / 1000; + long endTime = sdf.parse(ntcConnRecordPercent.getSearchFoundEndTime().toString().trim()).getTime() / 1000; + if (endTime - startTime < 0) { + throw new RestServiceException("searchFoundStartTime() can not exceed searchFoundEndTime", + RestBusinessCode.param_formate_error.getValue()); + } + long second = endTime - startTime; + StringBuffer sql = new StringBuffer(); + sql.append("SELECT SUM(s2c_pkt_num + s2c_pkt_num)*8/"); + sql.append(second); + sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/"); + sql.append(second); + sql.append( + " AS bps FROM tbs_ods_ntc_conn_record_log_local_1 t WHERE found_time IN ( SELECT DISTINCT found_time FROM tbs_ods_ntc_conn_record_log_local_1 WHERE found_time >= "); + sql.append(startTime); + sql.append(" and found_time< "); + sql.append(endTime); + StringBuffer totalSql = new StringBuffer(); + totalSql.append(sql); + totalSql.append(" and stream_dir in(1,2,3)) and stream_dir in(1,2,3)"); + sql.append(" and stream_dir in(1,2) ) and stream_dir in(1,2)"); + localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent, sql.toString(), false); + localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent, totalSql.toString(), true); + return ntcConnRecordPercent; + } + /** * 根据类名加对应的标识获取hive或者clickhouse中对应的表名 * @@ -95,16 +127,11 @@ public class LogDataService { /** * 从clickhouse中查询数据,注意clickhouse区分大小写,目前和百分点商定都是用小写 * - * @param page - * 里面含有pagesize和pageno,order by - * @param bean - * 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名 - * @param tableName - * 表名 - * @param className - * 类名 - * @param orderBy - * orderby条件 + * @param page 里面含有pagesize和pageno,order by + * @param bean 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名 + * @param tableName 表名 + * @param className 类名 + * @param orderBy orderby条件 * @throws Exception */ private void getDataFromClickHouse(Page page, Object bean, String tableName, String className, @@ -172,7 +199,8 @@ public class LogDataService { if (field.equals("url")) { whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'"); } else { - whereSB.append(" and " + field + "='" + StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "'"); + whereSB.append(" and " + field + "='" + + StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "'"); } } else if (type.equals("java.lang.Integer") || type.equals("int") || type.equals("java.lang.Long") || type.equals("long")) { @@ -213,30 +241,23 @@ public class LogDataService { sql.append(whereSB.substring(indexOf) + " and found_time in(" + foundTimeSql + ") "); } sql.append(orderBy.toLowerCase() + " limit " + startNum + "," + page.getPageSize());// clickhouse的分页与mysql相同 - - if(tableName.toUpperCase().equals("TBS_ODS_NTC_CONN_RECORD_LOG_LOCAL")) { + + if (tableName.toUpperCase().equals("TBS_ODS_NTC_CONN_RECORD_LOG_LOCAL")) { searchFromLocalCK(page, bean, sql, countSql); - }else { + } else { searchFromDataCenter(page, bean, sql, countSql); } - - - + } /** * 从hive中查询数据 * - * @param page - * 里面含有pagesize和pageno,order by - * @param bean - * 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名 - * @param tableName - * 表名 - * @param className - * 类名 - * @param orderBy - * orderby条件 + * @param page 里面含有pagesize和pageno,order by + * @param bean 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名 + * @param tableName 表名 + * @param className 类名 + * @param orderBy orderby条件 * @throws Exception */ private void getDataFromHive(Page page, Object bean, String tableName, String className, String orderBy) @@ -375,18 +396,19 @@ public class LogDataService { private void searchFromDataCenter(Page page, Object bean, StringBuffer selSql, StringBuffer countSql) throws Exception { // if (Constants.ISOPENLOGCOUNTANDLAST) { - logJDBCByDruid.getCount(page, countSql.toString()); + logJDBCByDruid.getCount(page, countSql.toString()); // } if (page.getCount() > 0) { logJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass()); - if(page.getLast()>100) { + if (page.getLast() > 100) { page.setLast(100); } } else { - logger.info("没有查询到数据,sql={}",countSql.toString()); + logger.info("没有查询到数据,sql={}", countSql.toString()); } } + private void searchFromLocalCK(Page page, Object bean, StringBuffer selSql, StringBuffer countSql) throws Exception { // if (Constants.ISOPENLOGCOUNTANDLAST) { @@ -394,13 +416,13 @@ public class LogDataService { // } if (page.getCount() > 0) { localLogJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass()); - if(page.getLast()>100) { + if (page.getLast() > 100) { page.setLast(100); } } else { - logger.info("没有查询到数据,sql={}",countSql.toString()); + logger.info("没有查询到数据,sql={}", countSql.toString()); } - + } /** @@ -426,7 +448,7 @@ public class LogDataService { * 将fileds中的字段根据DfLogSearchDao.xml中对应的resultMap转换为数据库中的字段 * * @param mapName - * @param fileds与界面商定好的是传日志类中的对象名(界面没有表结构不知道对象属性对应的数据库字段名称是什么),不是数据库中的字段名 + * @param fileds与界面商定好的是传日志类中的对象名(界面没有表结构不知道对象属性对应的数据库字段名称是什么),不是数据库中的字段名 * @return * @throws Exception */ diff --git a/src/main/resources/jdbc.properties.astana b/src/main/resources/jdbc.properties.astana index da6fd93..6480bcb 100644 --- a/src/main/resources/jdbc.properties.astana +++ b/src/main/resources/jdbc.properties.astana @@ -41,7 +41,7 @@ jdbc.clickhouse.password=XmaxnU2yLPQ5dpWjY3RDjQ== jdbc.ckLocal.url=jdbc:clickhouse://10.0.8.14:8123/k18_ods?socket_timeout=90000 jdbc.ckLocal.username=default -#实际密码k18 +#实际密码ceiec2018 jdbc.ckLocal.key=p8yBsnjQ2S4qT0XeSTi7lQ== jdbc.ckLocal.password=obYXo/qhb8fDaQbTpX9slA==