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

1.生效区域下发格式修改 2.日志总量日志查询时间修改

Browse Source
This commit is contained in:
zhangwenqing
2018-09-28 12:00:13 +08:00
parent ab50f58560
commit 9ce49b9e25
9 changed files with 194 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -678,8 +678,19 @@ public class BaseController {
}else{
// 判断是否是从配置界面过来的日志查询
if(StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
Calendar time = Calendar.getInstance();
time.add(Calendar.MINUTE, -5);
String searchEndTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundEndTime",searchEndTime);
entry.setSearchFoundEndTime(searchEndTime);
time.add(Calendar.MINUTE, -5);
String searchStartTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundStartTime", searchStartTime);
entry.setSearchFoundStartTime(searchStartTime);
// 判断startTime是否有值
if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
/*if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
String endTime = Constants.LOG_TIME_END;
if(StringUtils.isBlank(endTime)) {
endTime = DateUtils.getDateTime();
@@ -717,7 +728,7 @@ public class BaseController {
params.put("searchFoundEndTime",searchEndTime);
entry.setSearchFoundStartTime(searchStartTime);
entry.setSearchFoundEndTime(searchEndTime);
}
}*/
}else {
//设置默认查询当前时间及前五分钟