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

恢复原Gbps单位

Browse Source
This commit is contained in:
dongxiaoyan
2019-01-18 15:09:37 +08:00
parent d616166507
commit 99dad7c0a4
5 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/report/NtcAsnRecord.java
View File

@@ -6,9 +6,7 @@ import com.nis.util.excel.ExcelField;
public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
private static final long serialVersionUID = -4947912502754359817L;
@ExcelField(title="GBps",sort=10)
protected String GBps;
//@ExcelField(title="bps",sort=10)
@ExcelField(title="bps",sort=10)
protected String bps;
@ExcelField(title="pps",sort=9)
protected String pps;
@@ -27,13 +25,7 @@ public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
this.searchAsnType = searchAsnType;
}
protected String searchAsnType;//1:d_asn;2:s_asn
public String getGBps() {
return bps;
}
public void setGBps(String gBps) {
GBps = this.getBps();
}
public String getBps() {
return bps;
}

3
src/main/resources/messages/message_en.properties
View File

@@ -1475,5 +1475,4 @@ block_drop=Block(Drop)
mail_record=Mail Records
ssl_record=SSL Records
http_record=HTTP Records
second_bps=bps
GBps=GBps
second_bps=bps

3
src/main/resources/messages/message_ru.properties
View File

@@ -1479,5 +1479,4 @@ framework_log=\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0438\u0440\u043e
block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435)
mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b
ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438
http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438
GBps=GBps
http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1475,5 +1475,4 @@ block_drop=\u5c01\u5835(\u4e22\u5f03)
mail_record=\u90ae\u4ef6\u6cdb\u6536
ssl_record=SSL\u6cdb\u6536
http_record=HTTP\u6cdb\u6536
second_bps=bps
GBps=GBps
second_bps=bps

2
src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
View File

@@ -230,7 +230,7 @@
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
<th class="sort-column s_asn" column="asn"><spring:message code="asn"/></th>
<th class="sort-column pps" column="pps"><spring:message code="pps"/></th>
<th class="sort-column bps" column="bps"><spring:message code="GBps"/></th>
<th class="sort-column bps" column="bps"><spring:message code="bps"/></th>
</tr>
</thead>
<tbody>