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

提交日志查询三种时间方案.

Browse Source
This commit is contained in:
zhangwenqing
2018-09-02 13:01:10 +08:00
parent 2831badaad
commit 3447a87f63
4 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/util/Constants.java
View File

@@ -437,8 +437,11 @@ public final class Constants {
//默认日志查询时长(ms)
public static final String LOG_TIME_START = Configurations.getStringProperty("log_time_start",null);
public static final String LOG_TIME_END = Configurations.getStringProperty("log_time_end",null);
//默认日志查询时长(ms)
//由配置界面跳转日志查询默认查询时长(ms)
public static final Integer LOG_TIME_RANGE = Configurations.getIntProperty("log_time_range", 300000);
//默认日志查询时长(ms)
public static final Integer LOG_TIME_INTERVAL = Configurations.getIntProperty("log_time_interval", 300000);
//日志检索菜单ID
public static final Integer LOGSEARCH_MENU_ID = Configurations.getIntProperty("logsearch_menu_id", 152);
/**请求头参数*/

58
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -671,14 +671,56 @@ public class BaseController {
params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
}else{
//设置默认查询当前时间及前五分钟
String endTime = DateUtils.getDateTime();
Date dateStart = new Date(new Date().getTime() - Constants.LOG_TIME_RANGE);
String startTime = DateUtils.formatDateTime(dateStart);
params.put("searchFoundStartTime", startTime);
params.put("searchFoundEndTime",endTime );
entry.setSearchFoundStartTime(startTime);
entry.setSearchFoundEndTime(endTime);
// 判断是否是从配置界面过来的日志查询
if(entry.getCfgId() != null) {
String endTime = Constants.LOG_TIME_END;
if(StringUtils.isBlank(endTime)) {
endTime = DateUtils.getDateTime();
}
// 判断startTime是否有值
if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
params.put("searchFoundStartTime", Constants.LOG_TIME_START);
params.put("searchFoundEndTime",endTime );
entry.setSearchFoundStartTime(Constants.LOG_TIME_START);
entry.setSearchFoundEndTime(endTime);
}else {
Calendar startTimeCal = Calendar.getInstance();
// 时间间隔
int interval = Constants.LOG_TIME_RANGE/1000/60;
if(interval < 60) {
// 查询上一个5分钟
startTimeCal.set(Calendar.SECOND, 0);
int minute = startTimeCal.get(Calendar.MINUTE);
startTimeCal.set(Calendar.MINUTE, minute/interval*interval);
}else {
// 查询上一个1小时
startTimeCal.set(Calendar.SECOND, 0);
startTimeCal.set(Calendar.MINUTE, 0);
}
Calendar endTimeCal = Calendar.getInstance();
endTimeCal.setTimeInMillis(startTimeCal.getTimeInMillis());
endTimeCal.add(Calendar.SECOND, -1);
startTimeCal.add(Calendar.MINUTE, -interval); //开始时间减去时间间隔
String searchStartTime = DateUtils.formatDateTime(startTimeCal.getTime());
String searchEndTime = DateUtils.formatDateTime(endTimeCal.getTime());
params.put("searchFoundStartTime", searchStartTime);
params.put("searchFoundEndTime",searchEndTime);
entry.setSearchFoundStartTime(searchStartTime);
entry.setSearchFoundEndTime(searchEndTime);
}
}else {
//设置默认查询当前时间及前五分钟
String endTime = DateUtils.getDateTime();
Date dateStart = new Date(new Date().getTime() - Constants.LOG_TIME_INTERVAL);
String startTime = DateUtils.formatDateTime(dateStart);
params.put("searchFoundStartTime", startTime);
params.put("searchFoundEndTime",endTime );
entry.setSearchFoundStartTime(startTime);
entry.setSearchFoundEndTime(endTime);
}
}
if (StringUtils.isNotBlank(entry.getTransProto())) {

4
src/main/java/com/nis/web/dao/SysMenuDao.xml
View File

@@ -171,7 +171,7 @@
FROM
sys_menu m
WHERE
m.function_id = #{functionId} AND m.parent_ids LIKE '%${logSearchId}%'
m.function_id = #{functionId} AND m.parent_ids LIKE '%${logSearchId}%' AND del_flag = 1
</select>
<select id="getServiceId" resultType="Integer">
@@ -180,6 +180,6 @@
FROM
function_service_dict s
WHERE
s.function_id = #{functionId} AND s.action = #{action}
s.function_id = #{functionId} AND s.action = #{action} AND s.is_valid = 1
</select>
</mapper>

3
src/main/resources/nis.properties
View File

@@ -280,7 +280,7 @@ trafficWebTypeChart=trafficWebTypeChart
client_connect_timeout=300000
client_read_timeout=300000
log_time_range=300000
log_time_interval=300000
logsearch_menu_id=152
#use elasticsearch or not#
isUseES=false
@@ -467,5 +467,6 @@ app_id_region=APP_ID
app_spec_service_code_max_val=310000
app_spec_service_code_min_val=300001
groupReuseSources=groupReuseSources
log_time_range=3600000
log_time_start=2018-07-01 00:00:00
log_time_end=2018-08-01 00:00:00