Protocol配置列表增加源/目的IP、关键字检索.

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -369,18 +369,17 @@
 	    	<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="(ipPort.srcIpAddress != null and ipPort.srcIpAddress != '') or (ipPort.srcPort != null and ipPort.srcPort != '')">
+	    	<if test="ipPort != null">
 	    		AND r.compile_id in (select t.compile_id from ip_port_cfg t 
 	    		<where>
-	    			and t.protocol_id=4
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+	    				and  t.src_ip_address =#{ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
 		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+	    				and  t.dest_ip_address =#{ipPort.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
 		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
@@ -388,46 +387,16 @@
 	    		</where>
 	    		 )
 	    	</if>
-	  <!--   	<if test="(voipIp.srcIpAddress != null and voipIp.srcIpAddress != '') or (voipIp.srcPort != null and voipIp.srcPort != '')">
+	    	<if test="voipAccount != null">
-	    		AND r.compile_id in (select t.compile_id from av_voip_ip_cfg t 
+	    		AND r.compile_id in (SELECT s.compile_id FROM av_voip_account_cfg s
 	    		<where>
-	    			<if test="voipIp.srcIpAddress != null and voipIp.srcIpAddress != ''">
+	    			<if test="voipAccount.cfgKeywords != null and voipAccount.cfgKeywords != ''">
-	    				and  t.src_ip_address =#{voipIp.srcIpAddress,jdbcType=VARCHAR}
+	    				REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-		    		<if test="voipIp.srcPort != null  and voipIp.srcPort != ''">
+				</where>
-		    			and  t.src_port =#{voipIp.srcPort,jdbcType=VARCHAR}
+				)
-		    		</if>
-	    		</where>
-	    		 )
-	    	</if> -->
-	    	<if test="(ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != '') ">
-	    		AND r.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
-	    		<where>
-	    			<if test="ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-		    		<if test="compileId != null">
-		    			and  f.compile_id =#{compileId,jdbcType=INTEGER}
-		    		</if>
-	    		</where>
-	    		 )
 	    	</if>
-	    	<if test="avContUrlCfg!=null">
+	  		<!-- 数据范围过滤 -->
-	    	<if test="(avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != '') ">
-	    		AND r.compile_id in (select s.compile_id from av_cont_url_cfg s
-	    		<where>
-	    			<if test="avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != ''">
-	    				and  s.cfg_keywords  like concat(concat('%',#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-		    		<if test="compileId != null">
-		    			and  s.compile_id =#{compileId,jdbcType=INTEGER}
-		    		</if>
-	    		</where>
-	    		 )
-	    	 </if>
-	    	</if>
-	    	
-	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
 	    </trim>
 	    <choose>

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml

@@ -265,15 +265,15 @@
 	    	<if test="ipPort!=null">
 	    		AND a.compile_id in (select t.compile_id from ip_port_cfg t 
 	    		<where>
-	    			and t.protocol_id=4
+	    			and t.protocol_id=7
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+	    				and  t.src_ip_address =#{ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
 		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+	    				and  t.dest_ip_address =#{ipPort.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
 		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
@@ -281,6 +281,11 @@
 	    		</where>
 	    		 )
 	    	</if>
+	    	<if test="searchKeywords != null and searchKeywords !=''">
+	    		AND a.compile_id in (SELECT d.compile_id FROM ftp_keyword_cfg d WHERE
+	    			d.cfg_keywords LIKE concat(concat('%',#{searchKeywords,jdbcType=VARCHAR}),'%')
+				)
+	    	</if>
 	    	<if test="ntcSubscribeIdCfg != null">
 	    		AND a.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
 	    		<where>
@@ -293,16 +298,6 @@
 	    		</where>
 	    		 )
 	    	</if>
-	    	<!-- <if test="ftp!=null">
-	    		AND a.compile_id in (select f.compile_id from ftp_keyword_cfg f
-	    		<where>
-	    			<if test="ftp.cfgKeywords != null and ftp.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{ftp.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-
-	    		</where>
-	    		 )
-	    	</if> -->
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
 	    </trim>
@@ -691,15 +686,14 @@
 	    	<if test="ipPort!=null">
 	    		AND a.compile_id in (select t.compile_id from ip_port_cfg t 
 	    		<where>
-	    			and t.protocol_id=4
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+	    				and  t.src_ip_address =#{ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
 		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+	    				and  t.dest_ip_address =#{ipPort.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
 		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
@@ -708,27 +702,25 @@
 	    		 )
 	    	</if>
 	    	<if test="p2pHash!=null">
-	    		AND a.compile_id in (select f.compile_id from p2p_hash_cfg h
+	    		AND a.compile_id in (select h.compile_id from p2p_hash_cfg h
 	    		<where>
 	    			<if test="p2pHash.cfgKeywords != null and p2pHash.cfgKeywords != ''">
-	    				and  h.cfg_keywords  like concat(concat('%',#{p2pHash.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    				REPLACE(h.cfg_keywords,'***and***','|') like concat(concat('%',#{p2pHash.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-
+				</where>
-	    		</where>
 	    		 )
 	    	</if>
 	    	<if test="p2pKeyword!=null">
-	    		AND a.compile_id in (select f.compile_id from p2p_keyword_cfg k
+	    		AND a.compile_id in (select k.compile_id from p2p_keyword_cfg k
 	    		<where>
 	    			<if test="p2pKeyword.cfgKeywords != null and p2pKeyword.cfgKeywords != ''">
-	    				and  k.cfg_keywords  like concat(concat('%',#{p2pKeyword.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    				REPLACE(k.cfg_keywords,'***and***','|') like concat(concat('%',#{p2pKeyword.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-
+				</where>
-	    		</where>
 	    		 )
 	    	</if>
 	    	<if test="ntcSubscribeIdCfg!=null">
-	    		AND a.compile_id in (select f.compile_id from ntc_subscribe_id_cfg s
+	    		AND a.compile_id in (select s.compile_id from ntc_subscribe_id_cfg s
 	    		<where>
 	    			<if test="ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != ''">
 	    				and  s.cfg_keywords  like concat(concat('%',#{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR}),'%')

src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml

@@ -216,15 +216,15 @@
 	    	<if test="ipPort!=null">
 	    		AND a.compile_id in (select t.compile_id from ip_port_cfg t 
 	    		<where>
-	    			and t.protocol_id=4
+	    			and t.protocol_id=5
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+	    				and  t.src_ip_address =#{ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
 		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+	    				and  t.dest_ip_address =#{ipPort.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
 		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
@@ -232,16 +232,11 @@
 	    		</where>
 	    		 )
 	    	</if>
-	    	<!-- <if test="mail!=null">
+	    	<if test="searchKeywords != null and searchKeywords !=''">
-	    		AND a.compile_id in (select f.compile_id from mail_keyword_cfg f
+	    		AND a.compile_id in (SELECT m.compile_id FROM mail_keyword_cfg m WHERE
-	    		<where>
+	    			REPLACE(m.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{searchKeywords,jdbcType=VARCHAR}),'%')
-	    			<if test="mail.cfgKeywords != null and mail.cfgKeywords != ''">
+				)
-	    				and  f.cfg_keywords  like concat(concat('%',#{mail.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    	</if>
-		    		</if>
-
-	    		</where>
-	    		 )
-	    	</if> -->
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
 	    </trim>

src/main/resources/messages/message_zh_CN.properties

@@ -1312,3 +1312,5 @@ http_req_body_keywords=\u8BF7\u6C42\u5185\u5BB9\u5173\u952E\u5B57
 http_res_body_keywords=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57
 http_req_hdr_keywords=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57
 http_res_hdr_keywords=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57
+p2p_eMule_keywords=eMule\u641C\u7D22\u5173\u952E\u5B57
+p2p_hash_keywords=\u6587\u4EF6\u6807\u8BC6\u5173\u952E\u5B57

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -22,16 +22,12 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.voipIp.srcIpAddress}"){
-			$("#intype").val("${cfg.voipIp.srcIpAddress}");
-		}else if("${cfg.voipAccount.cfgKeywords}"){
-			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
-		}else if("${cfg.voipIp.srcPort}"){
+		}else if("${cfg.ipPort.srcIpAddress}"){
-			$("#intype").val("${cfg.voipIp.srcPort}");
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
-		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
+		}else if("${cfg.ipPort.destIpAddress}"){
-			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -171,10 +167,10 @@
                                         	<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"/></form:option>
-												<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
-												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option> --%>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option> --%>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
-												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -22,16 +22,14 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.voipIp.srcIpAddress}"){
-			$("#intype").val("${cfg.voipIp.srcIpAddress}");
-		}else if("${cfg.voipAccount.cfgKeywords}"){
-			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
-		}else if("${cfg.voipIp.srcPort}"){
+		}else if("${cfg.ipPort.srcIpAddress}"){
-			$("#intype").val("${cfg.voipIp.srcPort}");
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
-		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
+		}else if("${cfg.ipPort.destIpAddress}"){
-			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
+		}else if("${cfg.voipAccount.cfgKeywords}"){
+			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -171,8 +169,9 @@
                                         	<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"/></form:option>
-												<%--<form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
-												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>-->											<form:option value="voipAccount.cfgKeywords"><spring:message code="av_voip_account_control"/></form:option>--%>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												<form:option value="voipAccount.cfgKeywords"><spring:message code="keywords"/></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<%--<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>--%>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -10,10 +10,14 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
-			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
+		}else if("${cfg.searchKeywords}"){
+			$("#intype").val("${cfg.searchKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -139,11 +143,10 @@
                                         	<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="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
-												<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
-												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+												<form:option value="searchKeywords"><spring:message code="keywords"/></form:option>
-												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
+												<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option> --%>
-												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp

@@ -11,6 +11,14 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
+		}else if("${cfg.p2pHash.cfgKeywords}"){
+			$("#intype").val("${cfg.p2pHash.cfgKeywords}");
+		}else if("${cfg.p2pKeyword.cfgKeywords}"){
+			$("#intype").val("${cfg.p2pKeyword.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -149,6 +157,10 @@
                                         	<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="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												<form:option value="p2pKeyword.cfgKeywords"><spring:message code="p2p_eMule_keywords"/></form:option>
+												<form:option value="p2pHash.cfgKeywords"><spring:message code="p2p_hash_keywords"/></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -12,6 +12,12 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
+		}else if("${cfg.searchKeywords}"){
+			$("#intype").val("${cfg.searchKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -149,11 +155,12 @@
                                          
                                         	<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="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<c:if test="${cfg.functionId eq '35'}">
-												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+													<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
-												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
+													<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
-												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												</c:if>
+												<form:option value="searchKeywords"><spring:message code="keywords"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>