diff --git a/src/main/java/com/nis/domain/report/NtcAsnRecord.java b/src/main/java/com/nis/domain/report/NtcAsnRecord.java index 5877e78ef..f3bdcbb55 100644 --- a/src/main/java/com/nis/domain/report/NtcAsnRecord.java +++ b/src/main/java/com/nis/domain/report/NtcAsnRecord.java @@ -6,8 +6,9 @@ import com.nis.util.excel.ExcelField; public class NtcAsnRecord extends BaseLogEntity{ private static final long serialVersionUID = -4947912502754359817L; - - @ExcelField(title="bps",sort=10) + @ExcelField(title="GBps",sort=10) + protected String GBps; + //@ExcelField(title="bps",sort=10) protected String bps; @ExcelField(title="pps",sort=9) protected String pps; @@ -26,7 +27,13 @@ public class NtcAsnRecord extends BaseLogEntity{ 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; } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f8d59f674..7fa96f445 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1475,4 +1475,5 @@ block_drop=Block(Drop) mail_record=Mail Records ssl_record=SSL Records http_record=HTTP Records -second_bps=bps \ No newline at end of file +second_bps=bps +GBps=GBps \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 0c0c00b84..86980082f 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1479,4 +1479,5 @@ 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 \ No newline at end of file +http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438 +GBps=GBps \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 188458816..7ef037d10 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1475,4 +1475,5 @@ 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 \ No newline at end of file +second_bps=bps +GBps=GBps \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp index bdd37d706..8ba476c4a 100644 --- a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp +++ b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp @@ -230,7 +230,7 @@ --%> - +