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

事件报表：解决导出没有隐藏列的问题

Browse Source
This commit is contained in:
lihaochen
2018-12-28 19:31:42 +08:00
parent b33dcac303
commit 79e0fd2947
6 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<NtcEventMonitorOrBlockReport> eventBlockPrint(@ModelAttribute("log") NtcEventMonitorOrBlockReport log, Model model,
HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes) {
public List<NtcEventMonitorOrBlockReport> eventBlockPrint(@ModelAttribute("log") NtcEventMonitorOrBlockReport log,
Model model, HttpServletRequest request, HttpServletResponse response,
RedirectAttributes redirectAttributes) {
try {
PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response);
Map<String, Object> params = new HashMap<String, Object>();
@@ -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<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {

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

@@ -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();

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

@@ -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<NtcEventMonitorOrBlockReport> 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();

18
src/main/webapp/WEB-INF/views/report/eventBlockList.jsp
View File

@@ -274,15 +274,15 @@
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
<th class="sort-column ip_count" column="ipNum"><spring:message code="ip_count"/></th>
<th class="sort-column http_num" column="httpNum"><spring:message code="http_num"/></th>
<th class="sort-column mail_num" column="mailNum"><spring:message code="mail_num"/></th>
<th class="sort-column vedio_count" column="vedioNum"><spring:message code="vedio_count"/></th>
<th class="sort-column agent_count" column="agentNum"><spring:message code="agent_count"/></th>
<th class="sort-column task_time" column="taskTime"><spring:message code="task_time"/></th>
<th class="sort-column stat_time" column="reportTime"><spring:message code="stat_time"/></th>
<th class="sort-column task_id" column="task_id"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="task_name"><spring:message code="task_name"/></th>
<th class="sort-column ip_count" column="ip_count"><spring:message code="ip_count"/></th>
<th class="sort-column http_num" column="http_num"><spring:message code="http_num"/></th>
<th class="sort-column mail_num" column="mail_num"><spring:message code="mail_num"/></th>
<th class="sort-column vedio_count" column="vedio_count"><spring:message code="vedio_count"/></th>
<th class="sort-column agent_count" column="agent_count"><spring:message code="agent_count"/></th>
<th class="sort-column task_time" column="task_time"><spring:message code="task_time"/></th>
<th class="sort-column stat_time" column="stat_time"><spring:message code="stat_time"/></th>
<%-- <th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th> --%>
</tr>
</thead>

16
src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp
View File

@@ -271,14 +271,14 @@
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
<th class="sort-column letter_num" column="letterNum"><spring:message code="letter_num"/></th>
<th class="sort-column config_num" column="configNum"><spring:message code="config_num"/></th>
<th class="sort-column monitor_num" column="monitorNum"><spring:message code="monitor_num"/></th>
<th class="sort-column control_num" column="controlNum"><spring:message code="control_num"/></th>
<th class="sort-column task_time" column="taskTime"><spring:message code="task_time"/></th>
<th class="sort-column stat_time" column="reportTime"><spring:message code="stat_time"/></th>
<th class="sort-column task_id" column="task_id"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="task_name"><spring:message code="task_name"/></th>
<th class="sort-column letter_num" column="letter_num"><spring:message code="letter_num"/></th>
<th class="sort-column config_num" column="config_num"><spring:message code="config_num"/></th>
<th class="sort-column monitor_num" column="monitor_num"><spring:message code="monitor_num"/></th>
<th class="sort-column control_num" column="control_num"><spring:message code="control_num"/></th>
<th class="sort-column task_time" column="task_time"><spring:message code="task_time"/></th>
<th class="sort-column stat_time" column="stat_time"><spring:message code="stat_time"/></th>
<%-- <th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th> --%>
</tr>
</thead>

18
src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp
View File

@@ -283,15 +283,15 @@
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
<th class="sort-column ip_count" column="ipNum"><spring:message code="ip_count"/></th>
<th class="sort-column http_num" column="httpNum"><spring:message code="http_num"/></th>
<th class="sort-column mail_num" column="mailNum"><spring:message code="mail_num"/></th>
<th class="sort-column vedio_count" column="vedioNum"><spring:message code="vedio_count"/></th>
<th class="sort-column agent_count" column="agentNum"><spring:message code="agent_count"/></th>
<th class="sort-column task_time" column="taskTime"><spring:message code="task_time"/></th>
<th class="sort-column stat_time" column="reportTime"><spring:message code="stat_time"/></th>
<th class="sort-column task_id" column="task_id"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="task_name"><spring:message code="task_name"/></th>
<th class="sort-column ip_count" column="ip_count"><spring:message code="ip_count"/></th>
<th class="sort-column http_num" column="http_num"><spring:message code="http_num"/></th>
<th class="sort-column mail_num" column="mail_num"><spring:message code="mail_num"/></th>
<th class="sort-column vedio_count" column="vedio_count"><spring:message code="vedio_count"/></th>
<th class="sort-column agent_count" column="agent_count"><spring:message code="agent_count"/></th>
<th class="sort-column task_time" column="task_time"><spring:message code="task_time"/></th>
<th class="sort-column stat_time" column="stat_time"><spring:message code="stat_time"/></th>
<%-- <th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th> --%>
</tr>
</thead>