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

Merge branch 'cherry-pick-7210fca1' into 'feature-traffic-log'

Browse Source 
1.修复IP top10 使用类型报错 由integer改为Long

See merge request K18_NTCS_WEB/NTC!4
This commit is contained in:
王鑫
2019-01-18 16:48:11 +08:00
parent 0409a5f8c8 84e691d03b
commit b1ee15772b
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/dashboard/DashboardController.java
View File

@@ -267,8 +267,8 @@ public class DashboardController extends BaseController{
//两个时间段之间的秒数
double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
for(TrafficIpActiveStatistic data:list) {
data.setAvgByte(lf.format(Integer.parseInt(data.get_byte())*8/allSeconds));
data.setAvgPacket(lf.format(Integer.parseInt(data.get_packet())/allSeconds));
data.setAvgByte(lf.format(Long.parseLong(data.get_byte())*8/allSeconds));
data.setAvgPacket(lf.format(Long.parseLong(data.get_packet())/allSeconds));
}
}
Collections.sort(list, new Comparator<TrafficIpActiveStatistic>() {

2
src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
View File

@@ -163,7 +163,7 @@
<th><spring:message code="bytes"/></th>
<th><spring:message code="percentage"/> (<spring:message code="bytes"/>)</th>
<th><spring:message code="pps"/></th>
<th><spring:message code="second_bps"/></th>
<th class='lowercase'><spring:message code="second_bps"/></th>
</tr>
</thead>
<tbody id="tableData"></tbody>

2
src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
View File

@@ -121,7 +121,7 @@
<th class="tl"><spring:message code="GByte"/></th>
<th class="tl"><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
<th class="tl"><spring:message code="pps"/></th>
<th class="tl"><spring:message code="second_bps"/></th>
<th class="tl lowercase"><spring:message code="second_bps"/></th>
</tr>
</thead>
<tbody id="tableData"></tbody>

2
src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
View File

@@ -83,7 +83,7 @@
<th class="tl"><spring:message code="GByte"/></th>
<th class="tl"><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
<th class="tl"><spring:message code="pps"/></th>
<th class="tl"><spring:message code="second_bps"/></th>
<th class="tl lowercase"><spring:message code="second_bps"/></th>
</tr>
</thead>
<tbody id="tableData"></tbody>

2
src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
View File

@@ -101,7 +101,7 @@
<th><spring:message code="packet"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="pps"/></th>
<th><spring:message code="second_bps"/></th>
<th class='lowercase'><spring:message code="second_bps"/></th>
</tr>
</thead>
<tbody id="tbodyData">

2
src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
View File

@@ -108,7 +108,7 @@
<th class="tl"><spring:message code="GByte"/></th>
<th class="tl"><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
<th class="tl"><spring:message code="pps"/></th>
<th class="tl"><spring:message code="second_bps"/></th>
<th class="tl lowercase"><spring:message code="second_bps"/></th>
</tr>
</thead>
<tbody id="tableData"></tbody>

2
src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
View File

@@ -151,7 +151,7 @@
<th><spring:message code="GByte"/></th>
<th><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
<th><spring:message code="pps"/> </th>
<th><spring:message code="second_bps"/></th>
<th class='lowercase'><spring:message code="second_bps"/></th>
</tr>
</thead>
<tbody id="tableData"></tbody>

4
src/main/webapp/static/pages/css/pageLogs.css
View File

@@ -14,7 +14,7 @@ table.logTb td ~td {
-moz-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
} */
/*列表标题首字母大写 */
table thead tr th{
/*鍒楄〃鏍囬棣栧瓧姣嶅ぇ鍐<EFBFBD> */
table thead tr th:not(.lowercase){
text-transform: capitalize;
}