gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

事件报表：1.筛选条件上 专项列表展示过滤了未审核的专项任务 2.解决了分页失效的问题

Browse Source
This commit is contained in:
lihaochen
2018-12-28 16:41:07 +08:00
parent 1ab978fb33
commit 62e875c50e
3 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/nis/web/controller/report/NtcEventBlockController.java
View File

@@ -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<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
List<TaskInfo> 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<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {

9
src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java
View File

@@ -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<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
List<TaskInfo> taskList = requestInfoService.showTask(new TaskInfo());
model.addAttribute("taskList", taskList);
}
}

14
src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java
View File

@@ -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<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
List<TaskInfo> taskList = requestInfoService.showTask(new TaskInfo());
model.addAttribute("taskList", taskList);
}
}