diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java index 6e9e98c04..e1c53ff14 100644 --- a/src/main/java/com/nis/domain/log/BaseLogEntity.java +++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java @@ -40,7 +40,7 @@ public class BaseLogEntity extends BaseEntity { protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss protected String searchFoundEndTime;//结束时间，格式同上 - protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识 + protected String isLogTotalSearch;//由配置界面跳转日志查询标识 protected String orderBy;//排序参数 //新增字段 diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 098c4c729..c956e956c 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -486,7 +486,34 @@ public class BaseController { protected void initReportCondition(Model model, SearchReport report) { List 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是否有值 /* diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 73e590569..e482825cb 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -373,21 +373,21 @@ white-space:nowrap;
-<%-- --%>

@@ -415,7 +415,7 @@ white-space:nowrap; - +