diff --git a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java index 6c0d2131f..e03671e6f 100644 --- a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java +++ b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java @@ -49,7 +49,7 @@ import com.nis.web.security.UserUtils; @RequestMapping("${adminPath}/log/pxy") public class PxyHttpManipulLogController extends BaseController{ - @RequestMapping(value = "/httpManipulList") + @RequestMapping(value = {"/httpManipulList", "/httpBlockLists", "/httpMonitLists"}) public String list(@ModelAttribute("log") PxyHttpManipulationLog log, Model model, HttpServletRequest request, HttpServletResponse response,Integer searchAction) { try { @@ -214,8 +214,16 @@ public class PxyHttpManipulLogController extends BaseController{ } } } - titleList.add("http_manipulation"); - classMap.put("http_manipulation", PxyHttpManipulationLog.class); + String title=""; + if(log.getAction().equals(1)){//监测 + title="http_monit"; + }else if(log.getAction().equals(16)){//阻断 + title="http_block"; + }else if(log.getAction().equals(48)){//操控 + title="http_manipulation"; + } + titleList.add(title); + classMap.put(title, PxyHttpManipulationLog.class); SysUser user = UserUtils.getUser(); if (!user.isAdmin()) { hColumns += ",scene_file,"; @@ -225,15 +233,15 @@ public class PxyHttpManipulLogController extends BaseController{ String cfgIndexInfoNoExport = ",req_header,resp_header,inner_smac,inner_dmac,nest_addr_list,scene_file," + ",found_time," + hColumns; - noExportMap.put("http_manipulation", cfgIndexInfoNoExport); - dataMap.put("http_manipulation", list); - String timeRange= initLogMaps(log,"http_manipulation"); + noExportMap.put(title, cfgIndexInfoNoExport); + dataMap.put(title, list); + String timeRange= initLogMaps(log,title); noExportMap.put("timeRange", timeRange); if ("csv".equals(type)) { - this._exportCsv(model, request, response, redirectAttributes, "http_manipulation", titleList, classMap, + this._exportCsv(model, request, response, redirectAttributes, title, titleList, classMap, dataMap, noExportMap); } else { - this._export(model, request, response, redirectAttributes, "http_manipulation", titleList, classMap, dataMap, + this._export(model, request, response, redirectAttributes, title, titleList, classMap, dataMap, noExportMap); } } catch (Exception e) { diff --git a/src/main/resources/sql/20190610/update_sys_menu.sql b/src/main/resources/sql/20190610/update_sys_menu.sql new file mode 100644 index 000000000..0579d375b --- /dev/null +++ b/src/main/resources/sql/20190610/update_sys_menu.sql @@ -0,0 +1,4 @@ +--修改日志检索->国家代理->HTTP(S)阻断 url +UPDATE `sys_menu` SET `href`='/log/pxy/httpBlockLists?searchAction=16' WHERE code='http_block' and href='/log/pxy/httpBlockList?searchAction=16' and permission= '' +--修改日志检索->国家代理->HTTP(S)监测 url +UPDATE `sys_menu` SET `href`='/log/pxy/httpMonitLists?searchAction=1' WHERE code='http_monit' and href='/log/pxy/httpMonitogs' and permission= '' \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp index 790605127..65de1406c 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp @@ -106,7 +106,15 @@

- + + + + + + + + +

@@ -117,6 +125,7 @@ + @@ -243,12 +252,12 @@
- --%>