From 8978cf0353aa26cc029f9712cf348519c3fb0d88 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 6 Nov 2018 19:03:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9APP=E7=89=B9=E5=BE=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=87=BAaction?=
 =?UTF-8?q?=E5=88=97title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/BaseCfg.java |  2 +-
 .../nis/web/dao/configuration/AppCfgDao.xml   |  4 +--
 .../configuration/AppMultiFeatureCfgDao.xml   | 25 +++++++++++--------
 .../views/cfg/app/appMultiFeatureCfgList.jsp  | 15 +++++++++++
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index 14483c5a4..b4a7a5191 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -72,7 +72,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * GK类型
 	 */
 	@Expose
-	@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
+	@ExcelField(title="block_type",dictType="SERVICE_ACTION",sort=2)
 	protected Integer action;
 	/**
 	 * 有效标识
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 038ecc035..12d5ca0aa 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -982,7 +982,7 @@
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfgKeywords != null and cfgKeywords != ''">
-	    		AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
+	    		AND REPLACE(r.CFG_KEYWORDS,'***and***','|') like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="district != null and district != ''">
 	    		AND r.DISTRICT =#{district,jdbcType=VARCHAR} 
@@ -1481,7 +1481,7 @@
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfgKeywords != null and cfgKeywords != ''">
-	    		AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
+	    		AND REPLACE(r.CFG_KEYWORDS,'***and***','|') like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="district != null and district != ''">
 	    		AND r.DISTRICT =#{district,jdbcType=VARCHAR} 
diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
index 7039a04cc..ec1caaf13 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
@@ -271,27 +271,30 @@
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
 	    	<if test="complexStrCfg!=null">
-	    		AND a.compile_id in (select f.compile_id from app_complex_feature_cfg f
+	    		AND r.compile_id in (select f.compile_id from app_complex_feature_cfg f
 	    		<where>
 	    			<if test="complexStrCfg.cfgKeywords != null and complexStrCfg.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{complexStrCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    				REPLACE(f.cfg_keywords ,'***and***','|') like concat(concat('%',#{complexStrCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-					<if test="complexStrCfg.district != null and complexStrCfg.district != ''">
-	    				and  f.district  like concat(concat('%',#{complexStrCfg.district,jdbcType=VARCHAR}),'%')
-		    		</if>
-	    		</where>
+				</where>
 	    		 )
 	    	</if>
 	    	<if test="strCfg!=null">
-	    		AND a.compile_id in (select f.compile_id from app_string_feature_cfg f
+	    		AND r.compile_id in (select f.compile_id from app_string_feature_cfg f
 	    		<where>
 	    			<if test="strCfg.cfgKeywords != null and strCfg.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{strCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    				REPLACE(f.cfg_keywords ,'***and***','|') like concat(concat('%',#{strCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-					<if test="strCfg.district != null and strCfg.district != ''">
-	    				and  f.district  like concat(concat('%',#{strCfg.district,jdbcType=VARCHAR}),'%')
+				</where>
+	    		 )
+	    	</if>
+	    	<if test="ipCfg!=null">
+	    		AND r.compile_id in (select f.compile_id from app_ip_range_cfg f
+	    		<where>
+	    			<if test="ipCfg.destIpAddress != null and ipCfg.destIpAddress != ''">
+	    				f.dest_ip_address = #{ipCfg.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
-	    		</where>
+				</where>
 	    		 )
 	    	</if>
 		  	<!-- 数据范围过滤 -->
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
index a9d1dcf63..3fe9f3e1d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
@@ -12,6 +12,12 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipCfg.destIpAddress}"){
+			$("#intype").val("${cfg.ipCfg.destIpAddress}");
+		}else if("${cfg.strCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.strCfg.cfgKeywords}");
+		}else if("${cfg.complexStrCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.complexStrCfg.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -152,6 +158,15 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<c:if test="${cfg.functionId ne 564 && cfg.functionId ne 567}">
+													<form:option value="ipCfg.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												</c:if>
+												<c:if test="${cfg.functionId ne 567}">
+													<form:option value="complexStrCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
+												</c:if>
+												<c:if test="${cfg.functionId eq 567}">
+													<form:option value="strCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
+												</c:if>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>