From 62e875c50eba57344cfac5c11a8a4273180d6a9d Mon Sep 17 00:00:00 2001 From: lihaochen Date: Fri, 28 Dec 2018 16:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8A=A5=E8=A1=A8=EF=BC=9A1.?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E4=B8=8A=20=E4=B8=93?= =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=BA=86=E6=9C=AA=E5=AE=A1=E6=A0=B8=E7=9A=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=202.=E8=A7=A3=E5=86=B3=E4=BA=86=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=A4=B1=E6=95=88=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 | 21 +++++++++---------- .../NtcEventKeyProtectionController.java | 9 ++++---- .../report/NtcEventMonitorController.java | 14 ++++--------- 3 files changed, 18 insertions(+), 26 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 5192b6522..e4994b965 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java @@ -35,16 +35,16 @@ import com.nis.util.Constants; import com.nis.util.TimeConstants; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; -import com.nis.web.service.basics.TaskInfoService; +import com.nis.web.service.configuration.RequestInfoService; @Controller @RequestMapping("${adminPath}/eventBlock") public class NtcEventBlockController extends BaseController { protected static Logger logger = LoggerFactory.getLogger(NtcEventBlockController.class); - + @Autowired - private TaskInfoService taskInfoService; + private RequestInfoService requestInfoService; /** * EventBlock @@ -89,7 +89,6 @@ public class NtcEventBlockController extends BaseController { params.put("searchTaskStartTime", searchTaskStartTime); params.put("searchTaskEndTime", searchTaskEndTime); - if (StringUtils.isNotBlank(log.getTaskIds())) { params.put("taskIds", log.getTaskIds()); } @@ -98,11 +97,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); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); @@ -116,7 +116,7 @@ public class NtcEventBlockController extends BaseController { page.setList(data.getList()); model.addAttribute("page", page); // 获取专项列表 - List taskList = taskInfoService.findTaskInfo(new TaskInfo()); + List taskList = requestInfoService.showTask(new TaskInfo()); model.addAttribute("taskList", taskList); } } @@ -147,7 +147,6 @@ public class NtcEventBlockController extends BaseController { params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); - // 判断请求参数 String searchReportStartTime = null; String searchReportEndTime = null; @@ -172,7 +171,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()); @@ -182,11 +180,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 3f37dfbb6..382022fcc 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java @@ -31,12 +31,11 @@ import com.nis.domain.PageLog; import com.nis.domain.configuration.TaskInfo; import com.nis.domain.maat.LogRecvData; import com.nis.domain.report.NtcEventKeyProtectionReport; -import com.nis.domain.report.NtcEventMonitorOrBlockReport; import com.nis.util.Constants; import com.nis.util.TimeConstants; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; -import com.nis.web.service.basics.TaskInfoService; +import com.nis.web.service.configuration.RequestInfoService; @Controller @RequestMapping("${adminPath}/eventKeyProtection") @@ -45,7 +44,7 @@ public class NtcEventKeyProtectionController extends BaseController { protected static Logger logger = LoggerFactory.getLogger(NtcEventKeyProtectionController.class); @Autowired - private TaskInfoService taskInfoService; + private RequestInfoService requestInfoService; /** * EventBlock @@ -93,7 +92,7 @@ public class NtcEventKeyProtectionController extends BaseController { if (StringUtils.isNotBlank(log.getTaskIds())) { params.put("taskIds", log.getTaskIds()); } - + log.setSearchReportStartTime(searchReportStartTime); log.setSearchReportEndTime(searchReportEndTime); log.setSearchTaskStartTime(searchTaskStartTime); @@ -115,7 +114,7 @@ public class NtcEventKeyProtectionController extends BaseController { page.setList(data.getList()); model.addAttribute("page", page); // 获取专项列表 - List taskList = taskInfoService.findTaskInfo(new TaskInfo()); + List taskList = requestInfoService.showTask(new TaskInfo()); model.addAttribute("taskList", taskList); } } 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 cc13a89dc..d171d3dad 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java @@ -2,9 +2,7 @@ package com.nis.web.controller.report; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -32,15 +30,12 @@ import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.configuration.TaskInfo; import com.nis.domain.maat.LogRecvData; -import com.nis.domain.report.BaseReport; import com.nis.domain.report.NtcEventMonitorOrBlockReport; -import com.nis.domain.report.NtcURLReport; import com.nis.util.Constants; -import com.nis.util.DateUtils; import com.nis.util.TimeConstants; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; -import com.nis.web.service.basics.TaskInfoService; +import com.nis.web.service.configuration.RequestInfoService; @Controller @RequestMapping("${adminPath}/eventMonitor") @@ -49,7 +44,7 @@ public class NtcEventMonitorController extends BaseController { protected static Logger logger = LoggerFactory.getLogger(NtcEventMonitorController.class); @Autowired - private TaskInfoService taskInfoService; + private RequestInfoService requestInfoService; /** * EventMonitor @@ -97,7 +92,7 @@ public class NtcEventMonitorController extends BaseController { if (StringUtils.isNotBlank(log.getTaskIds())) { params.put("taskIds", log.getTaskIds()); } - + log.setSearchReportStartTime(searchReportStartTime); log.setSearchReportEndTime(searchReportEndTime); log.setSearchTaskStartTime(searchTaskStartTime); @@ -120,8 +115,7 @@ public class NtcEventMonitorController extends BaseController { page.setLast(data.getLast()); page.setList(data.getList()); model.addAttribute("page", page); - // 获取专项列表 - List taskList = taskInfoService.findTaskInfo(new TaskInfo()); + List taskList = requestInfoService.showTask(new TaskInfo()); model.addAttribute("taskList", taskList); } }