From 6ac2cfccabf3f2f692e4f25ec8e9754446d759f6 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Tue, 18 Dec 2018 06:10:15 +0800 Subject: [PATCH] =?UTF-8?q?NTCIPRANCE=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/domain/report/NtcIpRangeReport.java | 41 ++++++++++++++++++- .../controller/report/ReportController.java | 22 ++++++---- .../resources/messages/message_en.properties | 5 ++- .../resources/messages/message_ru.properties | 5 ++- .../messages/message_zh_CN.properties | 5 ++- .../views/report/ipRangeReportList.jsp | 27 ++++++------ 6 files changed, 80 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/nis/domain/report/NtcIpRangeReport.java b/src/main/java/com/nis/domain/report/NtcIpRangeReport.java index 8e1e7c4d4..5a152a573 100644 --- a/src/main/java/com/nis/domain/report/NtcIpRangeReport.java +++ b/src/main/java/com/nis/domain/report/NtcIpRangeReport.java @@ -13,19 +13,56 @@ public class NtcIpRangeReport extends BaseLogEntity{ protected String ipStart; @ExcelField(title="ip_end",sort=9) protected String ipEnd; - @ExcelField(title="ip_start_num",sort=10) + //@ExcelField(title="ip_start_num",sort=10) protected BigInteger ipStartNum; - @ExcelField(title="ip_end_num",sort=11) + //@ExcelField(title="ip_end_num",sort=11) protected BigInteger ipEndNum; @ExcelField(title="ip_sub",sort=12) protected String ipSub; + @ExcelField(title="country",sort=13) + protected String country; + public String getCountry() { + return country; + } + public void setCountry(String country) { + this.country = country; + } + public String getDesc() { + return desc; + } + public void setDesc(String desc) { + this.desc = desc; + } + @ExcelField(title="desc",sort=14) + protected String desc; protected String searchCountry;//国家 protected String searchStartIp;//开始IP protected String searchEndIp;//结束IP + protected String searchIp;//IP + protected String searchAreaType;//area 1境内；1境外 + protected String searchDesc;// + public String getSearchDesc() { + return searchDesc; + } + public void setSearchDesc(String searchDesc) { + this.searchDesc = searchDesc; + } + public String getSearchAreaType() { + return searchAreaType; + } + public void setSearchAreaType(String searchAreaType) { + this.searchAreaType = searchAreaType; + } + public String getSearchIp() { + return searchIp; + } + public void setSearchIp(String searchIp) { + this.searchIp = searchIp; + } public String getSearchCountry() { return searchCountry; } diff --git a/src/main/java/com/nis/web/controller/report/ReportController.java b/src/main/java/com/nis/web/controller/report/ReportController.java index 40b0353af..6ebddc734 100644 --- a/src/main/java/com/nis/web/controller/report/ReportController.java +++ b/src/main/java/com/nis/web/controller/report/ReportController.java @@ -177,11 +177,14 @@ public class ReportController extends BaseController { } //查询开始IP if (StringUtils.isNotBlank(log.getSearchStartIp())) { - params.put("searchStartIp", log.getSearchStartIp()); + params.put("searchIp", log.getSearchIp()); } - //查询结束IP - if (StringUtils.isNotBlank(log.getSearchEndIp())) { - params.put("searchEndIp", log.getSearchEndIp()); + // + if (StringUtils.isNotBlank(log.getSearchAreaType())) { + params.put("searchType", log.getSearchAreaType()); + } + if (StringUtils.isNotBlank(log.getSearchAreaType())) { + params.put("searchDesc", log.getSearchDesc()); } String url =Constants.LOG_BASE_URL + Constants.NTC_IP_RANGE_REPORT; @@ -315,11 +318,14 @@ public class ReportController extends BaseController { } //查询开始IP if (StringUtils.isNotBlank(log.getSearchStartIp())) { - params.put("searchStartIp", log.getSearchStartIp()); + params.put("searchIp", log.getSearchIp()); } - //查询结束IP - if (StringUtils.isNotBlank(log.getSearchEndIp())) { - params.put("searchEndIp", log.getSearchEndIp()); + // + if (StringUtils.isNotBlank(log.getSearchAreaType())) { + params.put("searchType", log.getSearchAreaType()); + } + if (StringUtils.isNotBlank(log.getSearchAreaType())) { + params.put("searchDesc", log.getSearchDesc()); } String url =Constants.LOG_BASE_URL + Constants.NTC_IP_RANGE_REPORT; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 389dbfe64..495bd3c9a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1406,4 +1406,7 @@ APP_TCP_SESSION_BYTE=Session ip_count=Unique IP Count counnection_count=Connection Count asn=asn -Unique_num=Unique \ No newline at end of file +Unique_num=Unique +ip=IP +country=Country +desc=Desc \ 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 0c902ce73..2c5d7f7f2 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1410,4 +1410,7 @@ APP_TCP_SESSION_BYTE=Session ip_count=Unique IP Count counnection_count=Connection Count asn=asn -Unique_num=Unique \ No newline at end of file +Unique_num=Unique +ip=IP +country=Country +desc=Desc \ 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 56d3ab966..698960518 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1406,4 +1406,7 @@ APP_TCP_SESSION_BYTE=Session ip_count=Unique IP Count counnection_count=Connection Count asn=asn -Unique_num=Unique \ No newline at end of file +Unique_num=Unique +ip=IP +country=Country +desc=Desc \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp b/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp index 2b8242d85..ef14c177e 100644 --- a/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp +++ b/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp @@ -59,28 +59,30 @@
- - + + <%-- - + --%> + Internal + External
- +
- +
- +
- +
@@ -113,23 +115,24 @@ --%> - - + + + <%-- - ▷ + ? --%> ${log.ipStart } ${log.ipEnd } - ${log.ipStartNum} - ${log.ipEndNum} ${log.ipSub} + ${log.country} + ${log.desc}