From 79e0fd29478eeec74c797e4744ce4f27a9c76dc2 Mon Sep 17 00:00:00 2001 From: lihaochen Date: Fri, 28 Dec 2018 19:31:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8A=A5=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA=E6=B2=A1=E6=9C=89=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=88=97=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 | 15 ++++++++------- .../NtcEventKeyProtectionController.java | 2 +- .../report/NtcEventMonitorController.java | 10 +++++----- .../WEB-INF/views/report/eventBlockList.jsp | 18 +++++++++--------- .../views/report/eventKeyProtectionList.jsp | 16 ++++++++-------- .../WEB-INF/views/report/eventMonitorList.jsp | 18 +++++++++--------- 6 files changed, 40 insertions(+), 39 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 3fea3d006..70990a7df 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java @@ -204,7 +204,7 @@ public class NtcEventBlockController extends BaseController { titleList.add("ntc_event_block_report"); classMap.put("ntc_event_block_report", NtcEventMonitorOrBlockReport.class); - String cfgIndexInfoNoExport = ""; + String cfgIndexInfoNoExport = "," + hColumns + ","; noExportMap.put("ntc_event_block_report", cfgIndexInfoNoExport); Properties msgProp = getMsgProp(); @@ -332,12 +332,13 @@ public class NtcEventBlockController extends BaseController { return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS); } - + // eventBlockPrint @ResponseBody @RequestMapping(value = "eventBlockPrint") - public List eventBlockPrint(@ModelAttribute("log") NtcEventMonitorOrBlockReport log, Model model, - HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes) { + public List eventBlockPrint(@ModelAttribute("log") NtcEventMonitorOrBlockReport log, + Model model, HttpServletRequest request, HttpServletResponse response, + RedirectAttributes redirectAttributes) { try { PageLog page = new PageLog(request, response); Map params = new HashMap(); @@ -367,7 +368,6 @@ public class NtcEventBlockController extends BaseController { params.put("searchReportEndTime", searchReportEndTime); params.put("searchTaskStartTime", searchTaskStartTime); params.put("searchTaskEndTime", searchTaskEndTime); - if (StringUtils.isNotBlank(log.getTaskIds())) { params.put("taskIds", log.getTaskIds()); @@ -377,11 +377,12 @@ public class NtcEventBlockController extends BaseController { log.setSearchReportEndTime(searchReportEndTime); log.setSearchTaskStartTime(searchTaskStartTime); log.setSearchTaskEndTime(searchTaskEndTime); - + params.put("reportType", 1); String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; -// String url = "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock"; + // String url = + // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock"; String recv = HttpClientUtil.getMsg(url, params, request); List list = new ArrayList<>(); if (StringUtils.isNotBlank(recv)) { 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 41c00d994..b770b667e 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java @@ -200,7 +200,7 @@ public class NtcEventKeyProtectionController extends BaseController { titleList.add("ntc_event_key_protection_report"); classMap.put("ntc_event_key_protection_report", NtcEventKeyProtectionReport.class); - String cfgIndexInfoNoExport = ""; + String cfgIndexInfoNoExport = "," + hColumns + ","; noExportMap.put("ntc_event_key_protection_report", cfgIndexInfoNoExport); Properties msgProp = getMsgProp(); 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 bda8ffa74..5f4d29f2e 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java @@ -102,8 +102,8 @@ public class NtcEventMonitorController extends BaseController { params.put("reportType", 2); String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; - // String url = - // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock"; +// String url = +// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock"; String recv = HttpClientUtil.getMsg(url, params, request); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); @@ -184,8 +184,8 @@ public class NtcEventMonitorController extends BaseController { params.put("reportType", 2); String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; - // String url = - // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock"; +// String url = +// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock"; String recv = HttpClientUtil.getMsg(url, params, request); List list = new ArrayList<>(); if (StringUtils.isNotBlank(recv)) { @@ -202,7 +202,7 @@ public class NtcEventMonitorController extends BaseController { titleList.add("ntc_event_monitor_report"); classMap.put("ntc_event_monitor_report", NtcEventMonitorOrBlockReport.class); - String cfgIndexInfoNoExport = ""; + String cfgIndexInfoNoExport = "," + hColumns + ","; noExportMap.put("ntc_event_monitor_report", cfgIndexInfoNoExport); Properties msgProp = getMsgProp(); diff --git a/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp b/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp index 93999d011..53fbf6767 100644 --- a/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp +++ b/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp @@ -274,15 +274,15 @@ --%> - - - - - - - - - + + + + + + + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp b/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp index f19e09e39..55e702363 100644 --- a/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp +++ b/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp @@ -271,14 +271,14 @@ --%> - - - - - - - - + + + + + + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp b/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp index 1ee1c7a49..aeb9133bb 100644 --- a/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp +++ b/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp @@ -283,15 +283,15 @@ --%> - - - - - - - - - + + + + + + + + + <%-- --%>