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

1:添加通联关系日志百分比查询接口

Browse Source 
2:用户行为统计删除只取前10个
This commit is contained in:
renkaige
2018-12-15 20:36:05 +06:00
parent 68e37c8f56
commit e9f838998b
6 changed files with 313 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java Normal file
View File

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

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

@@ -1,5 +1,7 @@
package com.nis.web.controller.restful; package com.nis.web.controller.restful;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; 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.NtcCollectRadiusLog;
import com.nis.domain.restful.NtcCollectVoipLog; import com.nis.domain.restful.NtcCollectVoipLog;
import com.nis.domain.restful.NtcConnRecordLog; import com.nis.domain.restful.NtcConnRecordLog;
import com.nis.domain.restful.NtcConnRecordPercent;
import com.nis.domain.restful.NtcDdosLog; import com.nis.domain.restful.NtcDdosLog;
import com.nis.domain.restful.NtcDnsLog; import com.nis.domain.restful.NtcDnsLog;
import com.nis.domain.restful.NtcFtpLog; import com.nis.domain.restful.NtcFtpLog;
@@ -79,8 +82,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpLog, NtcIpLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpLog, NtcIpLog.class, page);
logDataService.getData(page, ntcIpLog); logDataService.getData(page, ntcIpLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("IP地址日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("IP地址日志检索失败:" + e.getMessage());
logger.error("IP地址日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("IP地址日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"IP地址日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "IP地址日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -109,8 +112,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcHttpLog, NtcHttpLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcHttpLog, NtcHttpLog.class, page);
logDataService.getData(page, ntcHttpLog); logDataService.getData(page, ntcHttpLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("Http日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("Http日志检索失败:" + e.getMessage());
logger.error("Http日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("Http日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"Http日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "Http日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -139,8 +142,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcDnsLog, NtcDnsLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcDnsLog, NtcDnsLog.class, page);
logDataService.getData(page, ntcDnsLog); logDataService.getData(page, ntcDnsLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("Dns日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("Dns日志检索失败:" + e.getMessage());
logger.error("Dns日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("Dns日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"Dns日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "Dns日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -168,8 +171,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcMailLog, NtcMailLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcMailLog, NtcMailLog.class, page);
logDataService.getData(page, ntcMailLog); logDataService.getData(page, ntcMailLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("EMAIL日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("EMAIL日志检索失败:" + e.getMessage());
logger.error("EMAIL日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("EMAIL日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"EMAIL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "EMAIL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -198,8 +201,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcSslLog, NtcSslLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcSslLog, NtcSslLog.class, page);
logDataService.getData(page, ntcSslLog); logDataService.getData(page, ntcSslLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("SSL日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("SSL日志检索失败:" + e.getMessage());
logger.error("SSL日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("SSL日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"SSL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "SSL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -228,8 +231,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcPptpLog, NtcPptpLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcPptpLog, NtcPptpLog.class, page);
logDataService.getData(page, ntcPptpLog); logDataService.getData(page, ntcPptpLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("PPTP日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("PPTP日志检索失败:" + e.getMessage());
logger.error("PPTP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("PPTP日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"PPTP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "PPTP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -258,8 +261,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcL2tpLog, NtcL2tpLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcL2tpLog, NtcL2tpLog.class, page);
logDataService.getData(page, ntcL2tpLog); logDataService.getData(page, ntcL2tpLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("L2TP日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("L2TP日志检索失败:" + e.getMessage());
logger.error("L2TP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("L2TP日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"L2TP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "L2TP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -288,8 +291,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcOpenvpnLog, NtcOpenvpnLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcOpenvpnLog, NtcOpenvpnLog.class, page);
logDataService.getData(page, ntcOpenvpnLog); logDataService.getData(page, ntcOpenvpnLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("Openvpn日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("Openvpn日志检索失败:" + e.getMessage());
logger.error("Openvpn日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("Openvpn日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"Openvpn日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "Openvpn日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -319,8 +322,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpsecLog, NtcIpsecLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpsecLog, NtcIpsecLog.class, page);
logDataService.getData(page, ntcIpsecLog); logDataService.getData(page, ntcIpsecLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("IPSEC日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("IPSEC日志检索失败:" + e.getMessage());
logger.error("IPSEC日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("IPSEC日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"IPSEC日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "IPSEC日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -349,8 +352,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcSshLog, NtcSshLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcSshLog, NtcSshLog.class, page);
logDataService.getData(page, ntcSshLog); logDataService.getData(page, ntcSshLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("SSH日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("SSH日志检索失败:" + e.getMessage());
logger.error("SSH日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("SSH日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"SSH日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "SSH日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -381,8 +384,8 @@ public class NtcLogSearchController extends BaseRestController {
logDataService.getData(page, ntcFtpLog); logDataService.getData(page, ntcFtpLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("FTP日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("FTP日志检索失败:" + e.getMessage());
logger.error("FTP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("FTP日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"FTP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "FTP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -409,8 +412,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcAppLog, NtcAppLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcAppLog, NtcAppLog.class, page);
logDataService.getData(page, ntcAppLog); logDataService.getData(page, ntcAppLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("App日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("App日志检索失败:" + e.getMessage());
logger.error("App日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("App日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"App日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "App日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -438,8 +441,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcDdosLog, NtcDdosLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcDdosLog, NtcDdosLog.class, page);
logDataService.getData(page, ntcDdosLog); logDataService.getData(page, ntcDdosLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("DDos日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("DDos日志检索失败:" + e.getMessage());
logger.error("DDos日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("DDos日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"DDos日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "DDos日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -468,8 +471,8 @@ public class NtcLogSearchController extends BaseRestController {
logDataService.getData(page, ntcP2pLog); logDataService.getData(page, ntcP2pLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("P2P日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("P2P日志检索失败:" + e.getMessage());
logger.error("P2P日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("P2P日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"P2P日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "P2P日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -498,8 +501,8 @@ public class NtcLogSearchController extends BaseRestController {
logDataService.getData(page, ntcBgpLog); logDataService.getData(page, ntcBgpLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("BGP日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("BGP日志检索失败:" + e.getMessage());
logger.error("BGP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("BGP日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"BGP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "BGP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -527,8 +530,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcVoipLog, NtcVoipLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcVoipLog, NtcVoipLog.class, page);
logDataService.getData(page, ntcVoipLog); logDataService.getData(page, ntcVoipLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("NTC VoIP日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("NTC VoIP日志检索失败:" + e.getMessage());
logger.error("NTC VoIP日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("NTC VoIP日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"NTC VoIP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "NTC VoIP日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -558,8 +561,8 @@ public class NtcLogSearchController extends BaseRestController {
page); page);
logDataService.getData(page, ntcStreamMediaLog); logDataService.getData(page, ntcStreamMediaLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("流媒体协议日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("流媒体协议日志检索失败:" + e.getMessage());
logger.error("流媒体协议日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("流媒体协议日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"流媒体协议日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "流媒体协议日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -587,8 +590,8 @@ public class NtcLogSearchController extends BaseRestController {
ntcLogService.queryConditionCheck(auditLogThread, start, ntcKeywordsUrlLog, NtcKeywordsUrlLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcKeywordsUrlLog, NtcKeywordsUrlLog.class, page);
logDataService.getData(page, ntcKeywordsUrlLog); logDataService.getData(page, ntcKeywordsUrlLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("NTC关键字转URL日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("NTC关键字转URL日志检索失败:" + e.getMessage());
logger.error("NTC关键字转URL日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("NTC关键字转URL日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"NTC关键字转URL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "NTC关键字转URL日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -615,17 +618,17 @@ public class NtcLogSearchController extends BaseRestController {
try { try {
if (StringUtil.isEmpty(ntcCollectVoipLog.getSearchFoundStartTime()) if (StringUtil.isEmpty(ntcCollectVoipLog.getSearchFoundStartTime())
&& StringUtil.isEmpty(ntcCollectVoipLog.getSearchFoundEndTime())) { && StringUtil.isEmpty(ntcCollectVoipLog.getSearchFoundEndTime())) {
Map<String, String> map = DateUtils.getLocalTime(null, Map<String, String> map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute");
null, Constants.LOG_LOCAL_TIME, "minute");
ntcCollectVoipLog.setSearchFoundStartTime(map.get("startTime")); ntcCollectVoipLog.setSearchFoundStartTime(map.get("startTime"));
ntcCollectVoipLog.setSearchFoundEndTime(map.get("endTime")); 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); logDataService.getData(page, ntcCollectVoipLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("VoIp泛收日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("VoIp泛收日志检索失败:" + e.getMessage());
logger.error("VoIp泛收日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("VoIp泛收日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"VoIp泛收日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "VoIp泛收日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -637,8 +640,7 @@ public class NtcLogSearchController extends BaseRestController {
"VoIp泛收日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue()); "VoIp泛收日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue());
} }
} }
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) @RequestMapping(value = "/ntcCollectRadiusLogs", method = RequestMethod.GET)
@@ -652,17 +654,17 @@ public class NtcLogSearchController extends BaseRestController {
try { try {
if (StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundStartTime()) if (StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundStartTime())
&& StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundEndTime())) { && StringUtil.isEmpty(ntcCollectRadiusLog.getSearchFoundEndTime())) {
Map<String, String> map = DateUtils.getLocalTime(null, Map<String, String> map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute");
null, Constants.LOG_LOCAL_TIME, "minute");
ntcCollectRadiusLog.setSearchFoundStartTime(map.get("startTime")); ntcCollectRadiusLog.setSearchFoundStartTime(map.get("startTime"));
ntcCollectRadiusLog.setSearchFoundEndTime(map.get("endTime")); 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); logDataService.getData(page, ntcCollectRadiusLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("RADIUS泛收日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("RADIUS泛收日志检索失败:" + e.getMessage());
logger.error("RADIUS泛收日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("RADIUS泛收日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"RADIUS泛收日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "RADIUS泛收日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -678,7 +680,6 @@ public class NtcLogSearchController extends BaseRestController {
0); 0);
} }
@RequestMapping(value = "/ntcConnRecordLogs", method = RequestMethod.GET) @RequestMapping(value = "/ntcConnRecordLogs", method = RequestMethod.GET)
@ApiOperation(value = "通联关系日志查询", httpMethod = "GET", notes = "对日志功能“通联关系日志查询”提供数据基础查询服务") @ApiOperation(value = "通联关系日志查询", httpMethod = "GET", notes = "对日志功能“通联关系日志查询”提供数据基础查询服务")
public Map<String, ?> ntcConnRecordLogs(Page page, NtcConnRecordLog ntcConnRecordLog, Model model, public Map<String, ?> ntcConnRecordLogs(Page page, NtcConnRecordLog ntcConnRecordLog, Model model,
@@ -689,16 +690,15 @@ public class NtcLogSearchController extends BaseRestController {
try { try {
if (StringUtil.isEmpty(ntcConnRecordLog.getSearchFoundStartTime()) if (StringUtil.isEmpty(ntcConnRecordLog.getSearchFoundStartTime())
&& StringUtil.isEmpty(ntcConnRecordLog.getSearchFoundEndTime())) { && StringUtil.isEmpty(ntcConnRecordLog.getSearchFoundEndTime())) {
Map<String, String> map = DateUtils.getLocalTime(null, Map<String, String> map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute");
null, Constants.LOG_LOCAL_TIME, "minute");
ntcConnRecordLog.setSearchFoundStartTime(map.get("startTime")); ntcConnRecordLog.setSearchFoundStartTime(map.get("startTime"));
ntcConnRecordLog.setSearchFoundEndTime(map.get("endTime")); 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); logDataService.getData(page, ntcConnRecordLog);
} catch (Exception e) { } catch (Exception e) {
auditLogThread.setExceptionInfo("通联关系日志检索失败:"+e.getMessage()); auditLogThread.setExceptionInfo("通联关系日志检索失败:" + e.getMessage());
logger.error("通联关系日志检索失败："+ExceptionUtil.getExceptionMsg(e)); logger.error("通联关系日志检索失败：" + ExceptionUtil.getExceptionMsg(e));
if (e instanceof RestServiceException) { if (e instanceof RestServiceException) {
throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start, throw new RestServiceException(auditLogThread, System.currentTimeMillis() - start,
"通联关系日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode()); "通联关系日志检索失败：" + e.getMessage(), ((RestServiceException) e).getErrorCode());
@@ -710,7 +710,73 @@ public class NtcLogSearchController extends BaseRestController {
"通联关系日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue()); "通联关系日志检索失败：" + e.getMessage(), RestBusinessCode.service_runtime_error.getValue());
} }
} }
return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "通联关系日志检索成功", page, return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "通联关系日志检索成功", page, 0);
0); }
@RequestMapping(value = "/ntcConnRecordPercent", method = RequestMethod.GET)
@ApiOperation(value = "通联关系日志百分比查询", httpMethod = "GET", notes = "对日志功能“通联关系日志百分比查询”提供数据基础查询服务")
public Map<String, ?> 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<String, String> 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);
} }
} }

6
src/main/java/com/nis/web/dao/NtcReportDao.xml
View File

@@ -623,7 +623,7 @@
</choose> </choose>
</where> </where>
group by NAS_IP order by num desc limit 10; group by NAS_IP order by num desc
</select> </select>
<select id="findAccounList" parameterType="com.nis.domain.restful.NtcRadiusReport" <select id="findAccounList" parameterType="com.nis.domain.restful.NtcRadiusReport"
resultMap="NtcRadiusReportMap"> resultMap="NtcRadiusReportMap">
@@ -639,7 +639,7 @@
</choose> </choose>
</where> </where>
group by account order by num desc limit 10; group by account order by num desc
</select> </select>
<select id="findNtcRadiusReport" parameterType="com.nis.domain.restful.NtcRadiusReport" <select id="findNtcRadiusReport" parameterType="com.nis.domain.restful.NtcRadiusReport"
@@ -664,6 +664,6 @@
</choose> </choose>
</where> </where>
ORDER BY ORDER BY
REPORT_TIME ASC limit 10 REPORT_TIME ASC
</select> </select>
</mapper> </mapper>

45
src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java
View File

@@ -9,6 +9,7 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData; import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@@ -24,7 +25,7 @@ import org.springframework.stereotype.Repository;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.util.Constants; import com.nis.domain.restful.NtcConnRecordPercent;
import com.nis.web.service.SpringContextHolder; import com.nis.web.service.SpringContextHolder;
import com.zdjizhi.utils.StringUtil; 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;
}
/** /**
* 关闭数据库连接 * 关闭数据库连接
*/ */

84
src/main/java/com/nis/web/service/LogDataService.java
View File

@@ -2,6 +2,7 @@ package com.nis.web.service;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -18,6 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.nis.domain.Page; 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.Configurations;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.web.dao.impl.LocalLogJDBCByDruid; import com.nis.web.dao.impl.LocalLogJDBCByDruid;
@@ -50,6 +54,34 @@ public class LogDataService {
col2col.put("searchFoundEndTime", endMap); 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中对应的表名 * 根据类名加对应的标识获取hive或者clickhouse中对应的表名
* *
@@ -95,16 +127,11 @@ public class LogDataService {
/** /**
* 从clickhouse中查询数据,注意clickhouse区分大小写,目前和百分点商定都是用小写 * 从clickhouse中查询数据,注意clickhouse区分大小写,目前和百分点商定都是用小写
* *
* @param page * @param page 里面含有pagesize和pageno,order by
* 里面含有pagesize和pageno,order by * @param bean 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名
* @param bean * @param tableName 表名
* 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名 * @param className 类名
* @param tableName * @param orderBy orderby条件
* 表名
* @param className
* 类名
* @param orderBy
* orderby条件
* @throws Exception * @throws Exception
*/ */
private <T> void getDataFromClickHouse(Page<T> page, Object bean, String tableName, String className, private <T> void getDataFromClickHouse(Page<T> page, Object bean, String tableName, String className,
@@ -172,7 +199,8 @@ public class LogDataService {
if (field.equals("url")) { if (field.equals("url")) {
whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'"); whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'");
} else { } 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") } else if (type.equals("java.lang.Integer") || type.equals("int")
|| type.equals("java.lang.Long") || type.equals("long")) { || type.equals("java.lang.Long") || type.equals("long")) {
@@ -214,29 +242,22 @@ public class LogDataService {
} }
sql.append(orderBy.toLowerCase() + " limit " + startNum + "," + page.getPageSize());// clickhouse的分页与mysql相同 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); searchFromLocalCK(page, bean, sql, countSql);
}else { } else {
searchFromDataCenter(page, bean, sql, countSql); searchFromDataCenter(page, bean, sql, countSql);
} }
} }
/** /**
* 从hive中查询数据 * 从hive中查询数据
* *
* @param page * @param page 里面含有pagesize和pageno,order by
* 里面含有pagesize和pageno,order by * @param bean 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名
* @param bean * @param tableName 表名
* 日志类对象(从DfLogSearchDao.xml中获取对应的map,类名+Map),用来获取各个属性对应的数据库字段名 * @param className 类名
* @param tableName * @param orderBy orderby条件
* 表名
* @param className
* 类名
* @param orderBy
* orderby条件
* @throws Exception * @throws Exception
*/ */
private <T> void getDataFromHive(Page<T> page, Object bean, String tableName, String className, String orderBy) private <T> void getDataFromHive(Page<T> page, Object bean, String tableName, String className, String orderBy)
@@ -375,18 +396,19 @@ public class LogDataService {
private <T> void searchFromDataCenter(Page<T> page, Object bean, StringBuffer selSql, StringBuffer countSql) private <T> void searchFromDataCenter(Page<T> page, Object bean, StringBuffer selSql, StringBuffer countSql)
throws Exception { throws Exception {
// if (Constants.ISOPENLOGCOUNTANDLAST) { // if (Constants.ISOPENLOGCOUNTANDLAST) {
logJDBCByDruid.getCount(page, countSql.toString()); logJDBCByDruid.getCount(page, countSql.toString());
// } // }
if (page.getCount() > 0) { if (page.getCount() > 0) {
logJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass()); logJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass());
if(page.getLast()>100) { if (page.getLast() > 100) {
page.setLast(100); page.setLast(100);
} }
} else { } else {
logger.info("没有查询到数据,sql={}",countSql.toString()); logger.info("没有查询到数据,sql={}", countSql.toString());
} }
} }
private <T> void searchFromLocalCK(Page<T> page, Object bean, StringBuffer selSql, StringBuffer countSql) private <T> void searchFromLocalCK(Page<T> page, Object bean, StringBuffer selSql, StringBuffer countSql)
throws Exception { throws Exception {
// if (Constants.ISOPENLOGCOUNTANDLAST) { // if (Constants.ISOPENLOGCOUNTANDLAST) {
@@ -394,11 +416,11 @@ public class LogDataService {
// } // }
if (page.getCount() > 0) { if (page.getCount() > 0) {
localLogJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass()); localLogJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass());
if(page.getLast()>100) { if (page.getLast() > 100) {
page.setLast(100); page.setLast(100);
} }
} else { } else {
logger.info("没有查询到数据,sql={}",countSql.toString()); logger.info("没有查询到数据,sql={}", countSql.toString());
} }
} }
@@ -426,7 +448,7 @@ public class LogDataService {
* 将fileds中的字段根据DfLogSearchDao.xml中对应的resultMap转换为数据库中的字段 * 将fileds中的字段根据DfLogSearchDao.xml中对应的resultMap转换为数据库中的字段
* *
* @param mapName * @param mapName
* @param fileds与界面商定好的是传日志类中的对象名(界面没有表结构不知道对象属性对应的数据库字段名称是什么),不是数据库中的字段名 * @param fileds与界面商定好的是传日志类中的对象名(界面没有表结构不知道对象属性对应的数据库字段名称是什么),不是数据库中的字段名
* @return * @return
* @throws Exception * @throws Exception
*/ */

2
src/main/resources/jdbc.properties.astana
View File

@@ -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.url=jdbc:clickhouse://10.0.8.14:8123/k18_ods?socket_timeout=90000
jdbc.ckLocal.username=default jdbc.ckLocal.username=default
#实际密码k18 #实际密码ceiec2018
jdbc.ckLocal.key=p8yBsnjQ2S4qT0XeSTi7lQ== jdbc.ckLocal.key=p8yBsnjQ2S4qT0XeSTi7lQ==
jdbc.ckLocal.password=obYXo/qhb8fDaQbTpX9slA== jdbc.ckLocal.password=obYXo/qhb8fDaQbTpX9slA==