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

2
src/main/java/com/nis/domain/log/BaseLogEntity.java
View File

@@ -40,7 +40,7 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss
protected String searchFoundEndTime;//结束时间，格式同上 protected String searchFoundEndTime;//结束时间，格式同上
protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识 protected String isLogTotalSearch;//由配置界面跳转日志查询标识
protected String orderBy;//排序参数 protected String orderBy;//排序参数
//新增字段 //新增字段

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) { protected void initReportCondition(Model model, SearchReport report) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId()); 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); model.addAttribute("serviceList", serviceList);
if (StringUtils.isBlank(report.getReportTime())) { if (StringUtils.isBlank(report.getReportTime())) {
report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd")); report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
} }
@@ -809,15 +836,14 @@ public class BaseController {
// 判断是否是从配置界面过来的日志查询 // 判断是否是从配置界面过来的日志查询
if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) { if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
Calendar time = Calendar.getInstance(); Calendar time = Calendar.getInstance();
time.add(Calendar.MINUTE, -5);
String searchEndTime = DateUtils.formatDateTime(time.getTime()); String searchEndTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundEndTime", searchEndTime);
entry.setSearchFoundEndTime(searchEndTime);
time.add(Calendar.MINUTE, -5); time.add(Calendar.MINUTE, -5);
String searchStartTime = DateUtils.formatDateTime(time.getTime()); String searchStartTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundStartTime", searchStartTime); params.put("searchFoundStartTime", searchStartTime);
params.put("searchFoundEndTime", searchEndTime);
entry.setSearchFoundStartTime(searchStartTime); entry.setSearchFoundStartTime(searchStartTime);
entry.setSearchFoundEndTime(searchEndTime);
// 判断startTime是否有值 // 判断startTime是否有值
/* /*

10
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -373,21 +373,21 @@ white-space:nowrap;
</head> </head>
<body> <body>
<div class="page-content"> <div class="page-content">
<%-- <div class="theme-panel hidden-xs hidden-sm"> <%-- <div class="theme-panel hidden-xs hidden-sm">
<c:forEach items="${serviceList}" var="service" varStatus="status"> <c:forEach items="${serviceList}" var="service" varStatus="status">
<c:if test="${(service.action ne 128) && (service.serviceId ne 37) && (service.serviceId ne 149)}" > <c:if test="${(service.action ne 128) && (service.serviceId ne 37) && (service.serviceId ne 149)}" >
<div data-service="${service.serviceId}" class="service btn"> <div data-service="${service.serviceId}" class="service btn">
<spring:message code="total"/> <spring:message code="total"/>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action"> <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> <c:if test="${action.itemCode eq service.action}">
<spring:message code="${action.itemValue}"/> <spring:message code="${service.actionCode}"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
<span>0</span> <span>0</span>
</div> </div>
</c:if> </c:if>
</c:forEach> </c:forEach>
</div> --%> </div> --%>
<h3 class="page-title"> <h3 class="page-title">
<spring:message code="${bean.cfgName}"/> <spring:message code="${bean.cfgName}"/>
<small><spring:message code="report_list"/></small> <small><spring:message code="report_list"/></small>
@@ -415,7 +415,7 @@ white-space:nowrap;
<c:forEach items="${serviceList}" var="service" > <c:forEach items="${serviceList}" var="service" >
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.serviceId ne 37)&& (service.serviceId ne 149) }"> <c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.serviceId ne 37)&& (service.serviceId ne 149) }">
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option> <form:option value="${service.serviceId}"><spring:message code="${service.actionCode}"/></form:option>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>