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

1.由配置跳转日志查询默认时间修改为前五分钟 2.报表Action检索条件修改

Browse Source
This commit is contained in:
zhangwq
2018-12-10 11:09:04 +08:00
parent c8c3a51f37
commit bf3bf9dc7b
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,7 +486,34 @@ public class BaseController {
protected void initReportCondition(Model model, SearchReport report) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId());
// HTTP(+keyword)报表处理
if(report.getFunctionId() == 8){
serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
for (FunctionServiceDict serviceDict : serviceList) {
if(serviceDict.getFunctionId() == report.getFunctionId()){
if(serviceDict.getAction() == Constants.MONIT_ACTION){
serviceDict.setActionCode("log_search_http_monit");
}else if(serviceDict.getAction() == Constants.REJECT_ACTION){
serviceDict.setActionCode("log_search_http_reject");
}
}else{
if(serviceDict.getAction() == Constants.MONIT_ACTION){
serviceDict.setActionCode("log_search_keyword_monit");
}else if(serviceDict.getAction() == Constants.REJECT_ACTION){
serviceDict.setActionCode("log_search_keyword_reject");
}
}
}
}else{
String prefix = "action_";
for (FunctionServiceDict serviceDict : serviceList) {
if(!serviceDict.getActionCode().contains(prefix)){
serviceDict.setActionCode(prefix+serviceDict.getActionCode());
}
}
}
model.addAttribute("serviceList", serviceList);
if (StringUtils.isBlank(report.getReportTime())) {
report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
}
@@ -809,15 +836,14 @@ public class BaseController {
// 判断是否是从配置界面过来的日志查询
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);
params.put("searchFoundEndTime", searchEndTime);
entry.setSearchFoundStartTime(searchStartTime);
entry.setSearchFoundEndTime(searchEndTime);
// 判断startTime是否有值
/*