diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java index 096e9c247..ac925592e 100644 --- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java +++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java @@ -22,10 +22,12 @@ import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.DkBehaviorLog; import com.nis.domain.maat.LogRecvData; +import com.nis.util.CodeDicUtils; import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; +import com.nis.web.dao.dashboard.codedic.CodeResult; @Controller @RequestMapping(value = "${adminPath}/log/manipulation/dkbehaviorLogs") @@ -42,19 +44,45 @@ public class DkBehaviorLogController extends BaseController{ */ @RequestMapping(value={"list",""}) public String list(Model model,@ModelAttribute("log")DkBehaviorLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { - try { - PageLog page = new PageLog(request, response); Map params=new HashMap<>(); + String searchService=null; + List serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); + model.addAttribute("serviceList", serviceList); + if(entry.getAction()!=null){ + for(FunctionServiceDict service:serviceList){ + if(service.getAction().intValue()==entry.getAction().intValue()){ + searchService=service.getServiceId().toString(); + } + } + }else{ + for(int i=0;i serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); - model.addAttribute("serviceList", serviceList); - + //获取字典信息 + List protocolList=CodeDicUtils.getCodeList("protocolCode"); + List osList=CodeDicUtils.getCodeList("osCode"); + List browserList=CodeDicUtils.getCodeList("browserCode"); + List behaviorList=CodeDicUtils.getCodeList("behaviorCode"); + List appList=CodeDicUtils.getCodeList("appCode"); + model.addAttribute("protocolList", protocolList); + model.addAttribute("osList", osList); + model.addAttribute("browserList", browserList); + model.addAttribute("behaviorList", behaviorList); + model.addAttribute("appList", appList); String url = ""; url = Constants.LOG_BASE_URL+Constants.NTC_DKBEHAVIOR_LOG; String jsonString = HttpClientUtil.getMsg(url,params,request); @@ -81,4 +109,5 @@ public class DkBehaviorLogController extends BaseController{ return "/log/manipulation/dkBehaviorList"; } + } 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 751d36493..45b140820 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -5,8 +5,7 @@ @@ -58,24 +58,19 @@ $(document).ready(function(){
- -
+ +
+
@@ -232,35 +227,35 @@ $(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 3b8bd9fb7..cdc837d24 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -46,24 +46,18 @@
-
- +