From f05696e7d5d066c57408e740eeab6ba20e5a5fbd Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Tue, 28 Aug 2018 14:35:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A5=E5=BF=97=E5=8D=8F=E8=AE=AEp?=
 =?UTF-8?q?rotocolCode=E3=80=81osCode=E3=80=81browserCode=E3=80=81behavior?=
 =?UTF-8?q?Code=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2=E5=A4=84=E7=90=86=202?=
 =?UTF-8?q?=E3=80=81searchService=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manipulation/DkBehaviorLogController.java | 39 ++++++++++++++++---
 .../views/log/manipulation/dkBehaviorList.jsp | 37 ++++++++----------
 .../webapp/WEB-INF/views/log/ntc/bgpList.jsp  | 18 +++------
 3 files changed, 56 insertions(+), 38 deletions(-)

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<DkBehaviorLog> page = new PageLog<DkBehaviorLog>(request, response);
 			Map<String, Object> params=new HashMap<>();
+			String searchService=null;
+			List<FunctionServiceDict> 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.size();i++){
+					if(serviceList.get(i).getServiceId()!=32 && serviceList.get(i).getServiceId()!=128){
+						searchService = serviceList.get(i).getServiceId().toString();
+						entry.setAction(serviceList.get(i).getAction());
+						break;
+					}
+				}
+				
+			}
+			params.put("searchService", searchService);
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
-			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
-			model.addAttribute("serviceList", serviceList);
-			
+			//获取字典信息
+			List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
+			List<CodeResult> osList=CodeDicUtils.getCodeList("osCode");
+			List<CodeResult> browserList=CodeDicUtils.getCodeList("browserCode");
+			List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
+			List<CodeResult> 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 @@
 
 <script type="text/javascript">
 $(document).ready(function(){
-	//筛选功能
-	filterActionInit();
+
 	//reset
 	$("#resetBtn").on("click",function(){
 		$("select.selectpicker").each(function(){
@@ -20,7 +19,8 @@ $(document).ready(function(){
 		.attr("value",'');
 		$("#searchForm")[0].reset();
 	});
-	
+	//筛选功能
+	filterActionInit();
 });
 
 </script>
@@ -58,24 +58,19 @@ $(document).ready(function(){
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-									<select path="action" class="selectpicker select2 input-small">
-									<option value=""><spring:message code="action"/></option>
-									<c:forEach items="${serviceList}" var="service"
+									<form:select path="action" class="selectpicker select2 input-small">
+<%-- 									<form:option value=""><spring:message code="action"/></form:option>
+ --%>									<c:forEach items="${serviceList}" var="service"
 											varStatus="satus">
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%>
-												<option value="${dict.itemCode}" 
-													<c:if test="${log.action eq dict.itemCode}">
-														selected
-													</c:if>
-													>
-													<spring:message code="${dict.itemValue}"/>
-												</option>
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-								</select>
-								</div>
+								</form:select>
+							</div>
+							
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
@@ -232,35 +227,35 @@ $(document).ready(function(){
 									</td>
 									
 									<td>
-										<c:forEach items="${fns:getCodeList('protocolCode')}" var="dict">
+										<c:forEach items="${protocolList}" var="dict">
 											<c:if test="${dict.code eq log.labelProtoId}">
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getCodeList('osCode')}" var="dict">
+										<c:forEach items="${osList}" var="dict">
 											<c:if test="${dict.code eq log.labelOsId}">
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getCodeList('browserCode')}" var="dict">
+										<c:forEach items="${browserList}" var="dict">
 											<c:if test="${dict.code eq log.labelBsId}">
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getCodeList('behaviorCode')}" var="dict">
+										<c:forEach items="${behaviorList}" var="dict">
 											<c:if test="${dict.code eq log.labelBehavId}">
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getCodeList('appCode')}" var="dict">
+										<c:forEach items="${appList}" var="dict">
 											<c:if test="${dict.code eq log.labelAppId}">
 												<spring:message code="${dict.item}"/>
 											</c:if>
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 @@
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
-							<div class="pull-left">
-								<select path="action" class="selectpicker select2 input-small">
-									<option value=""><spring:message code="action"/></option>
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form:option>
 									<c:forEach items="${serviceList}" var="service"
 											varStatus="satus">
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%>
-												<option value="${dict.itemCode}" 
-													<c:if test="${log.action eq dict.itemCode}">
-														selected
-													</c:if>
-													>
-													<spring:message code="${dict.itemValue}"/>
-												</option>
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-								</select>
+								</form:select>
 							</div>
 							<div class="pull-left">
 								<div class="input-group">