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

1.文件摘要配置列表修改 2.mail日志增加加发件人、收件人、邮件主题的查询条件

Browse Source
This commit is contained in:
zhangwq
2018-12-11 18:39:02 +08:00
parent 56598e05f0
commit a4ff744a4f
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
View File

@@ -41,6 +41,17 @@ public class MailLogController extends BaseController {
params.put("pageNo", page.getPageNo()); params.put("pageNo", page.getPageNo());
initLogSearchValue(log, params); initLogSearchValue(log, params);
// 增加收/发件人、邮件主题查询
if (StringUtils.isNotBlank(log.getMailTo())) {
params.put("searchMailTo", log.getMailTo());
}
if (StringUtils.isNotBlank(log.getMailFrom())) {
params.put("searchMailFrom", log.getMailFrom());
}
if (StringUtils.isNotBlank(log.getSubject())) {
params.put("searchSubject", log.getSubject());
}
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList); model.addAttribute("serviceList", serviceList);

9
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -418,12 +418,17 @@
</td> </td>
<td>${indexCfg.rawLen }（B）</td> <td>${indexCfg.rawLen }（B）</td>
<td> <td>
<c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}"> <%-- <c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}">
${(indexCfg.cfdsLevel*10)} ${(indexCfg.cfdsLevel*10)}
</c:if> </c:if>
<c:if test="${indexCfg.cfdsLevel eq 1 || indexCfg.cfdsLevel > 10}"> <c:if test="${indexCfg.cfdsLevel eq 1 || indexCfg.cfdsLevel > 10}">
${indexCfg.cfdsLevel } ${indexCfg.cfdsLevel }
</c:if> </c:if> --%>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<c:if test="${configdenceC.itemCode eq indexCfg.cfdsLevel}">
${configdenceC.itemValue}
</c:if>
</c:forEach>
</td> </td>
<td> <td>
<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }" <a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"

29
src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
View File

@@ -197,9 +197,36 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group">
<label><spring:message code="mail_from"></spring:message>：</label>
<input name="mailFrom" type="text" class="form-control" value="${log.mailFrom }"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="mail_to"></spring:message>：</label>
<input name="mailTo" type="text" class="form-control" value="${log.mailTo }"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="subject"></spring:message>：</label>
<input name="subject" type="text" class="form-control" value="${log.subject }"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="cfg_id"></spring:message>：</label>
<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
</div>
</div>
<%-- <div class="col-md-2">
<label><spring:message code="cfg_id"></spring:message>：</label> <label><spring:message code="cfg_id"></spring:message>：</label>
<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/> <input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
</div> </div> --%>
</div> </div>
</div> </div>
<!-- /筛选搜索内容栏 结束--> <!-- /筛选搜索内容栏 结束-->