From f4acc8f0637f65c3d29cfaa57892a308475ebdde Mon Sep 17 00:00:00 2001 From: lihaochen Date: Thu, 27 Dec 2018 18:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=201.ASN=E3=80=81HttpsUrl=E3=80=81=E7=94=A8=E6=88=B7=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?,=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=AD=96=E7=95=A5=202.=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8,=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=93?= =?UTF-8?q?=E9=A1=B9=E5=90=8D=E7=A7=B0=E5=88=97=E8=A1=A8=E7=9A=84=E5=9B=9E?= =?UTF-8?q?=E6=98=BE,=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E8=BF=9B=E8=A1=8C=E4=BA=86=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9=203.=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=BA=86=E4=BA=8B=E4=BB=B6=E7=9B=91=E6=B5=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=87=BA=E5=AE=8C=E6=88=90=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/NtcEventBlockController.java | 2 + .../NtcEventKeyProtectionController.java | 6 +- .../report/NtcEventMonitorController.java | 2 + .../views/dashboard/trafficUserBehavior.jsp | 9 +- .../WEB-INF/views/report/asnRecordList.jsp | 10 ++- .../WEB-INF/views/report/eventBlockList.jsp | 64 +++++++------- .../views/report/eventKeyProtectionList.jsp | 66 +++++++------- .../WEB-INF/views/report/eventMonitorList.jsp | 87 +++++++++---------- .../WEB-INF/views/report/urlReportList.jsp | 8 +- 9 files changed, 138 insertions(+), 116 deletions(-) diff --git a/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java b/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java index 08b7856f4..6e4e2a813 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java @@ -136,6 +136,8 @@ public class NtcEventBlockController extends BaseController { Map noExportMap = new HashMap(); // --------------------------- PageLog page = new PageLog(request, response); + page.setPageNo(1); + page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); diff --git a/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java b/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java index 197672902..e3fe6edf7 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java @@ -94,7 +94,7 @@ public class NtcEventKeyProtectionController extends BaseController { params.put("taskIds", log.getTaskIds()); } - String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; + String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report; // String url = // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection"; String recv = HttpClientUtil.getMsg(url, params, request); @@ -135,6 +135,8 @@ public class NtcEventKeyProtectionController extends BaseController { Map noExportMap = new HashMap(); // --------------------------- PageLog page = new PageLog(request, response); + page.setPageNo(1); + page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); @@ -173,7 +175,7 @@ public class NtcEventKeyProtectionController extends BaseController { log.setSearchTaskStartTime(searchTaskStartTime); log.setSearchTaskEndTime(searchTaskEndTime); - String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; + String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report; // String url = // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection"; String recv = HttpClientUtil.getMsg(url, params, request); diff --git a/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java b/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java index b91e67e08..014d3fd04 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java @@ -141,6 +141,8 @@ public class NtcEventMonitorController extends BaseController { Map noExportMap = new HashMap(); // --------------------------- PageLog page = new PageLog(request, response); + page.setPageNo(1); + page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp index 058e5d178..1d2867364 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp @@ -158,6 +158,13 @@ return false; } + function setReportTime(){ + var chooseDate=new Date($('#searchFoundStartTime').val()); + chooseDate=chooseDate.setDate(chooseDate.getDate()+7); + var modifyTime=new Date(chooseDate); + $('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds())); + } + @@ -200,7 +207,7 @@ <%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%> + value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
diff --git a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp index a74234b59..8ba77f141 100644 --- a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp +++ b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp @@ -44,6 +44,14 @@ }; $("div#"+content+"").printArea(options); } + + function setReportTime(){ + var chooseDate=new Date($('#searchFoundStartTime').val()); + chooseDate=chooseDate.setDate(chooseDate.getDate()+7); + var modifyTime=new Date(chooseDate); + $('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds())); + } + @@ -86,7 +94,7 @@ <%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> + value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
diff --git a/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp b/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp index 76fdd80ed..cf0804c5e 100644 --- a/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp +++ b/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp @@ -3,11 +3,12 @@ - <spring:message code="https_url_report"/> + <spring:message code="ntc_event_block_report"/> @@ -67,44 +91,18 @@ +
- - - -<%-- --%> - -<%-- --%> - - - - - -<%-- --%> - - -<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> - - - - - -<%-- --%> - - -<%-- value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> - - -
- " class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder=""> @@ -146,7 +144,7 @@
+ value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
@@ -167,7 +165,7 @@
+ value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
diff --git a/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp b/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp index e7cd9968a..406121c95 100644 --- a/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp +++ b/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp @@ -3,11 +3,12 @@ - <spring:message code="https_url_report"/> + <spring:message code="ntc_event_key_protection_report"/> @@ -67,45 +92,18 @@ +
- - - -<%-- --%> - -<%-- --%> - - - - - - -<%-- --%> - - -<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> - - - - - -<%-- --%> - - -<%-- value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> - - -
- " class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder=""> @@ -147,7 +145,7 @@
+ value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
@@ -168,7 +166,7 @@
+ value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
diff --git a/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp b/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp index 0c4e64b3c..53f463082 100644 --- a/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp +++ b/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp @@ -3,11 +3,13 @@ - <spring:message code="https_url_report"/> + <spring:message code="ntc_event_monitor_report"/> @@ -67,60 +101,25 @@ - +
- - - -<%-- --%> - -<%-- --%> - - - - - -<%-- --%> - -<%-- --%> - -
- " class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="">
- - - - -<%-- --%> - - -<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> - - - - - -<%-- --%> - - -<%-- value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> - -
@@ -133,8 +132,8 @@
    -
    • -
    • +
    • +
+ value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
@@ -176,7 +175,7 @@
+ value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
diff --git a/src/main/webapp/WEB-INF/views/report/urlReportList.jsp b/src/main/webapp/WEB-INF/views/report/urlReportList.jsp index 507725f12..f13d9d96f 100644 --- a/src/main/webapp/WEB-INF/views/report/urlReportList.jsp +++ b/src/main/webapp/WEB-INF/views/report/urlReportList.jsp @@ -50,6 +50,12 @@ // ajaxConnPercent(); }); + function setReportTime(){ + var chooseDate=new Date($('#searchReportStartTime').val()); + chooseDate=chooseDate.setDate(chooseDate.getDate()+7); + var modifyTime=new Date(chooseDate); + $('#searchReportEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds())); + } @@ -86,7 +92,7 @@ <%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> + value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>