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

配置统计修改为功能统计

Browse Source
This commit is contained in:
DuanDongmei
2018-11-26 20:19:21 +08:00
parent 01815bcf76
commit 97b4fdd3cb
13 changed files with 153 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/WEB-INF/tlds/fns.tld
View File

@@ -53,6 +53,13 @@
<function-signature>java.util.List getMenuList()</function-signature>
<example>${fns:getMenuList()}</example>
</function>
<function>
<description>获取配置菜单对象列表</description>
<name>getMenuCfgList</name>
<function-class>com.nis.web.security.UserUtils</function-class>
<function-signature>java.util.List getMenuCfgList()</function-signature>
<example>${fns:getMenuCfgList()}</example>
</function>
<function>
<description>获取用户的菜单名称</description>

50
src/main/webapp/WEB-INF/views/index.jsp
View File

@@ -118,8 +118,20 @@
<thead>
<tr>
<th><spring:message code="letter"/></th>
<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
<th><spring:message code="${serviceDict.serviceName }"/></th>
<c:forEach items="${fns:getMenuCfgList() }" var="functionDict" varStatus="status" step="1">
<th>
<c:choose>
<c:when test="${functionDict.functionId eq 8}">
HTTP <spring:message code="${functionDict.code }"/>
</c:when>
<c:when test="${functionDict.functionId eq 35}">
MAIL <spring:message code="${functionDict.code }"/>
</c:when>
<c:otherwise>
<spring:message code="${functionDict.code }"/>
</c:otherwise>
</c:choose>
</th>
</c:forEach>
</tr>
</thead>
@@ -129,9 +141,13 @@
<td>
${requestStatistics['request']}
</td>
<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
<td>${requestStatistics[serviceDict.serviceName]}</td>
</c:forEach>
<c:forEach items="${fns:getMenuCfgList() }" var="functionDict" varStatus="status" step="1">
<td>
<c:set var="functionId" value="${functionDict.functionId}_${functionDict.functionId}"></c:set>
${requestStatistics[functionId]}
</<td>
</c:forEach>
</tr>
</c:forEach>
</tbody>
@@ -158,16 +174,34 @@
</thead>
<tbody>
<c:forEach items="${configStatistics }" var="statistics" varStatus="status" step="1">
<c:set var="serviceName" value=""></c:set>
<%-- <c:set var="serviceName" value=""></c:set>
<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
<c:if test="${serviceDict.serviceId eq statistics.service }">
<c:set var="serviceName" value="${serviceDict.serviceName }"></c:set>
</c:if>
</c:forEach> --%>
<c:set var="functionName" value=""></c:set>
<c:forEach items="${fns:getMenuCfgList() }" var="functionDict" varStatus="status" step="1">
<c:if test="${(functionDict.functionId eq statistics.functionId)}">
<c:choose>
<c:when test="${functionDict.functionId eq 8 && functionDict.code eq 'advanced'}">
<c:set var="functionName" value="HTTP ${functionDict.code }"></c:set>
</c:when>
<c:when test="${functionDict.functionId eq 35 && functionDict.code eq 'advanced'}">
<c:set var="functionName" value="MAIL ${functionDict.code }"></c:set>
</c:when>
<c:otherwise>
<c:set var="functionName" value="${functionDict.code }"></c:set>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
<c:if test="${!empty serviceName }">
<%-- <c:if test="${!empty serviceName }"> --%>
<c:if test="${!empty functionName }">
<tr>
<td>
<spring:message code="${serviceName }"/>
<%-- <spring:message code="${serviceName }"/>${serviceName } --%>
<spring:message code="${functionName }"/>
</td>
<td>
${statistics.approved }