diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java index c5343d236..a9e605b96 100644 --- a/src/main/java/com/nis/domain/log/BaseLogEntity.java +++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java @@ -40,6 +40,8 @@ public class BaseLogEntity extends BaseEntity { protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss protected String searchFoundEndTime;//结束时间，格式同上 + protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识 + public String getFoundTime() { return foundTime; } @@ -220,27 +222,24 @@ public class BaseLogEntity extends BaseEntity { public void setDate(String date) { this.date = date; } + public String getIsLogTotalSearch() { + return isLogTotalSearch; + } + public void setIsLogTotalSearch(String isLogTotalSearch) { + this.isLogTotalSearch = isLogTotalSearch; + } @Override public String toString() { - return "{\"cfgId\"=\"" + cfgId + "\", \"foundTime\"=\"" + foundTime - + "\", \"recvTime\"=\"" + recvTime + "\", \"transProto\"=\"" - + transProto + "\", \"addrType\"=\"" + addrType - + "\", \"dIp\"=\"" + dIp + "\", \"sIp\"=\"" + sIp - + "\", \"dPort\"=\"" + dPort + "\", \"sPort\"=\"" + sPort - + "\", \"service\"=\"" + service + "\", \"entranceId\"=\"" - + entranceId + "\", \"deviceId\"=\"" + deviceId - + "\", \"direction\"=\"" + direction + "\", \"streamDir\"=\"" - + streamDir + "\", \"capIp\"=\"" + capIp - + "\", \"addrList\"=\"" + addrList + "\", \"serverLocate\"=\"" - + serverLocate + "\", \"clientLocate\"=\"" + clientLocate - + "\", \"userRegion\"=\"" + userRegion + "\", \"sAsn\"=\"" - + sAsn + "\", \"dAsn\"=\"" + dAsn + "\", \"sSubscribeId\"=\"" - + sSubscribeId + "\", \"dSubscribeId\"=\"" + dSubscribeId - + "\", \"sceneFile\"=\"" + sceneFile + "\", \"functionId\"=\"" - + functionId + "\", \"action\"=\"" + action - + "\", \"seltype\"=\"" + seltype - + "\", \"searchFoundStartTime\"=\"" + searchFoundStartTime - + "\", \"searchFoundEndTime\"=\"" + searchFoundEndTime + "}"; + return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", transProto=" + + transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort + + ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId + + ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList=" + + addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + ", userRegion=" + + userRegion + ", sAsn=" + sAsn + ", dAsn=" + dAsn + ", sSubscribeId=" + sSubscribeId + + ", dSubscribeId=" + dSubscribeId + ", sceneFile=" + sceneFile + ", functionId=" + functionId + + ", action=" + action + ", date=" + date + ", seltype=" + seltype + ", searchFoundStartTime=" + + searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime + ", isLogTotalSearch=" + + isLogTotalSearch + "]"; } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 537c83f8a..a3048bd29 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -674,7 +674,7 @@ public class BaseController { params.put("searchFoundEndTime", entry.getSearchFoundEndTime()); }else{ // 判断是否是从配置界面过来的日志查询 - if(entry.getCfgId() != null) { + if(StringUtils.isNotBlank(entry.getIsLogTotalSearch())) { // 判断startTime是否有值 if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) { String endTime = Constants.LOG_TIME_END; @@ -687,7 +687,9 @@ public class BaseController { entry.setSearchFoundEndTime(endTime); }else { Calendar startTimeCal = Calendar.getInstance(); - startTimeCal.setTimeInMillis(Long.parseLong(entry.getDate()));// 同步日志总量查询时间 + if(StringUtils.isNotEmpty(entry.getDate())) { + startTimeCal.setTimeInMillis(Long.parseLong(entry.getDate()));// 同步日志总量查询时间 + } // 时间间隔 int interval = Constants.LOG_TIME_RANGE/1000/60; if(interval < 60) { @@ -702,7 +704,7 @@ public class BaseController { } Calendar endTimeCal = Calendar.getInstance(); endTimeCal.setTimeInMillis(startTimeCal.getTimeInMillis()); - endTimeCal.add(Calendar.SECOND, -1); + //endTimeCal.add(Calendar.SECOND, -1); startTimeCal.add(Calendar.MINUTE, -interval); //开始时间减去时间间隔 diff --git a/src/main/java/com/nis/web/controller/configuration/LogSearchController.java b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java index ac9abffc3..4bd69897c 100644 --- a/src/main/java/com/nis/web/controller/configuration/LogSearchController.java +++ b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java @@ -15,8 +15,8 @@ import com.nis.web.controller.BaseController; public class LogSearchController extends BaseController{ @RequestMapping(value = {"list",""}) - public String LogSearch(BaseLogEntity entity, Integer compileId,RedirectAttributes attr, - HttpServletRequest request, HttpServletResponse response) { + public String LogSearch(BaseLogEntity entity, RedirectAttributes attr, HttpServletRequest request, + HttpServletResponse response) { /** * url: logUrl * searchCfgId: compileId @@ -26,10 +26,11 @@ public class LogSearchController extends BaseController{ String logUrl = menuService.getLogUrl(entity.getFunctionId()); Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction()); - attr.addAttribute("cfgId", compileId); attr.addAttribute("service", serviceId); + attr.addAttribute("cfgId", entity.getCfgId()); attr.addAttribute("functionId", entity.getFunctionId()); attr.addAttribute("date", entity.getDate()); + attr.addAttribute("isLogTotalSearch", entity.getIsLogTotalSearch()); return "redirect:"+adminPath+logUrl; } } diff --git a/src/main/resources/sql/add_function_service.sql b/src/main/resources/sql/add_function_service.sql index 72912cedd..fd7ba3289 100644 --- a/src/main/resources/sql/add_function_service.sql +++ b/src/main/resources/sql/add_function_service.sql @@ -1,4 +1,9 @@ INSERT INTO function_service_dict (`dict_id`, `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES - (116, 570, 0, 1, 'monit', 520, 'pxy_intercept_monit_keyring', '', 1, null, null, null, null, ''); \ No newline at end of file + (116, 570, 0, 1, 'monit', 520, 'pxy_intercept_monit_keyring', '', 1, null, null, null, null, ''); + +INSERT INTO function_service_dict + (`function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) +VALUES + ('510', '0', '1', 'monit', '146', 'p2p_monit', NULL, '1', NULL, NULL, NULL, NULL, '1,2,3,4'); diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index c3ba3a9b9..762650012 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -52,6 +52,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index 0dd8febbf..cb38756a1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index c1c223754..20ac0b253 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -42,6 +42,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 41853fa9e..7738232b8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index 02fb34466..b5be6fd94 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -42,6 +42,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 070c43d4d..61b1b1a52 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 8d4bd650f..bed5e9dc2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -42,6 +42,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index d38f9dccc..6f1160ae6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -42,6 +42,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 61e7d069d..d9796433b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -43,6 +43,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index 1f595de06..a9f38e1d9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -47,6 +47,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index 9e7f989ff..67cf91d7c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -42,6 +42,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index 72c789722..e9cc6f011 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -43,6 +43,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index dbdf2939f..846162e91 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 0d2be860c..b5115a6f9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index 2f47305ea..4d95725f7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index e736a3f05..bdaa5e0f6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index b81414bd6..fdcd2814b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index b6f4e96f1..0dcaf4ea9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -57,6 +57,7 @@ value="${page.pageSize}" /> + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 16200e51c..f61c56fb7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index e9c7b4dc9..2ea300c98 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index d6acfe5a1..16d47c2fa 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index d8361913b..20956a85d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index c2f0f0a72..38728fe3c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index da502dddd..10b4499d6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index 51c8fcd56..a8f9ef606 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -43,6 +43,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index 2904fb212..ed58918bb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -47,6 +47,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index 32760babb..ee598c2fc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -44,6 +44,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index f2fcc3edc..e60d6d98c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -48,6 +48,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index 1441790e1..19e1f505e 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -42,6 +42,7 @@ + diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index b9952cae3..ab5d6dd31 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1390,11 +1390,7 @@ var GetLogTotal=function(_data){ for(var i=0;i"+data[i].sum+""); - }else{ - $(this).html(data[i].sum); - } + $(this).html(""+data[i].sum+""); hasLog=true; } } @@ -1436,7 +1432,8 @@ var toLogSearch = function(index){ var date=$(this).attr("date"); var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4); - window.location.href = pathName+"/toLogSearch?action="+action+"&functionId="+functionId+"&compileId="+compileId+"&date="+date; + window.location.href = pathName+"/toLogSearch?action="+action+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes"; + } }); diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js index b2c418e8c..954471ae1 100644 --- a/src/main/webapp/static/pages/scripts/pageLogs.js +++ b/src/main/webapp/static/pages/scripts/pageLogs.js @@ -50,8 +50,8 @@ $(document).ready(function() { }); // 添加由配置界面跳转到日志查询界面后的返回按钮 - var cfgId = $("input[name=cfgId]").val(); - if(cfgId != undefined && cfgId != ''){ + var isLogTotalSearch = $("#isLogTotalSearch").val(); + if(isLogTotalSearch != undefined && isLogTotalSearch != ''){ $(".theme-panel").html(""); } });