From ca0bc716f5b1c69d814a32e864829a07c27ee632 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Wed, 12 Sep 2018 20:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0action=E6=9F=A5=E8=AF=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ntc/AvContentController.java       | 12 ++++++------
 .../controller/configuration/ntc/AvController.java   |  6 +++---
 .../WEB-INF/views/cfg/av/contIp/contIpList.jsp       |  9 +++++++++
 .../WEB-INF/views/cfg/av/contUrl/contUrlList.jsp     |  9 +++++++++
 .../webapp/WEB-INF/views/cfg/av/fileSampleList.jsp   |  9 +++++++++
 .../webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp  |  9 +++++++++
 .../WEB-INF/views/cfg/av/picUrl/picUrlList.jsp       |  9 +++++++++
 .../webapp/WEB-INF/views/cfg/av/signSampleList.jsp   |  9 +++++++++
 .../WEB-INF/views/cfg/av/voip/voipAccountList.jsp    | 11 ++++++++++-
 .../webapp/WEB-INF/views/cfg/av/voip/voipList.jsp    | 11 ++++++++++-
 .../WEB-INF/views/cfg/proxy/fileStrategy/list.jsp    |  9 ---------
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp    |  9 ---------
 12 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
index d4bf62a8b..c94ecc550 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
@@ -143,7 +143,7 @@ public class AvContentController extends BaseController  {
 		}
 		Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/av/voip/voipList";
 	}
 	//视频文本VOIP Account配置列表
@@ -158,7 +158,7 @@ public class AvContentController extends BaseController  {
 		}
 		Page<CfgIndexInfo> page = avContentCfgService.findAccountPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/av/voip/voipAccountList";
 	}
 	
@@ -312,7 +312,7 @@ public class AvContentController extends BaseController  {
 			,RedirectAttributes redirectAttributes){
 		Page<BaseIpCfg> page = avContentCfgService.findContIpPage(new Page<BaseIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/av/contIp/contIpList";
 	}
 	//音视频CONTIP新增界面
@@ -394,7 +394,7 @@ public class AvContentController extends BaseController  {
 			,RedirectAttributes redirectAttributes){
 		Page<BaseIpCfg> page = avContentCfgService.findPicIpPage(new Page<BaseIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/av/picIp/picIpList";
 	}
 	//音视频CONTIP新增界面
@@ -477,7 +477,7 @@ public class AvContentController extends BaseController  {
 			,RedirectAttributes redirectAttributes){
 		Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/av/contUrl/contUrlList";
 	}
 	//音视频CONTUrl新增界面
@@ -559,7 +559,7 @@ public class AvContentController extends BaseController  {
 			,RedirectAttributes redirectAttributes){
 		Page<BaseStringCfg> page = avContentCfgService.findPicUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/av/picUrl/picUrlList";
 	}
 	//音视频CONTUrl新增界面
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
index df71e617f..3e864cf23 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
@@ -52,7 +52,7 @@ public class AvController extends BaseController  {
 	public String fileSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvFileSampleCfg entity){
 		Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(new Page<AvFileSampleCfg>(request, response,"a"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
 		for(FunctionRegionDict region:regionList){
 			model.addAttribute("regionValue",region.getConfigRegionValue());
@@ -65,7 +65,7 @@ public class AvController extends BaseController  {
 	public String audioSignSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvSignSampleCfg entity){
 		Page<AvSignSampleCfg> page = avCfgService.getAvSignSampleList(new Page<AvSignSampleCfg>(request, response,"a"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
 		for(FunctionRegionDict region:regionList){
 			model.addAttribute("regionValue",region.getConfigRegionValue());
@@ -79,7 +79,7 @@ public class AvController extends BaseController  {
 		List<AvSignSampleCfg> list = avCfgService.getSignSampleList(entity);
 		model.addAttribute("cfgs", list);
 		model.addAttribute("functionId", entity.getFunctionId());
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
 		for(FunctionRegionDict region:regionList){
 			model.addAttribute("regionValue",region.getConfigRegionValue());
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index f2b4195aa..67960acfe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -107,11 +107,20 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 3352b3b76..6db5bcc26 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -104,11 +104,20 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index a3d92cc17..7825e75f1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -98,11 +98,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index 454d7c22c..2fbbb8493 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -107,11 +107,20 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 986c18178..cc577ea7a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -105,11 +105,20 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 15c0a1754..0301581b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -107,11 +107,20 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="description"><spring:message code="sample_sign"></spring:message></form:option>
 												<form:option value="level"><spring:message code="harm_level"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index 039ef8679..f1f528f13 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -456,12 +456,21 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="account"/></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 											</form:select>
 									
                                          </div>
                                          
-                                         <input id="intype" class="form-control input-small" type="text" value="">
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index fe3a72aa0..27ea0e071 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -470,12 +470,21 @@
 												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
 												<form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 											</form:select>
 									
                                          </div>
                                          
-                                         <input id="intype" class="form-control input-small" type="text" value="">
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
index 0181c3649..19e618e2c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
@@ -94,20 +94,11 @@
                                          <div class="input-group-btn">
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="fileDesc"><spring:message code="file_desc"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  		 <div class="input-group-btn">
-	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
-													<form:option value=""><spring:message code="select"/></form:option>
-													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
-													</c:forEach>
-											 </form:select>
-										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 4b8dc9ba7..6a915dd0a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -77,20 +77,11 @@
 													<form:option value="requestNumber"><spring:message code="title"></spring:message></form:option>
 													<form:option value="requestTitle"><spring:message code="request_number"></spring:message></form:option>
 													<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  		 <div class="input-group-btn">
-	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
-													<form:option value=""><spring:message code="select"/></form:option>
-													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
-													</c:forEach>
-											 </form:select>
-										 </div>
                                             
                                         </div>
 	                               </div>