修改增强字符串类域的region属性为动态展示

src/main/java/com/nis/domain/FunctionRegionDict.java

@@ -16,6 +16,10 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	private String configDesc;
 	private Integer isMaat;
 	private Integer regionType;
+	private String configMultiKeywords;
+	private String configHex;
+	private String configExprType;
+	private String configMatchMethod;
 	public Integer getDictId() {
 		return dictId;
 	}
@@ -64,5 +68,30 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	public void setRegionType(Integer regionType) {
 		this.regionType = regionType;
 	}
+	public String getConfigMultiKeywords() {
+		return configMultiKeywords;
+	}
+	public void setConfigMultiKeywords(String configMultiKeywords) {
+		this.configMultiKeywords = configMultiKeywords;
+	}
+	public String getConfigHex() {
+		return configHex;
+	}
+	public void setConfigHex(String configHex) {
+		this.configHex = configHex;
+	}
+	public String getConfigExprType() {
+		return configExprType;
+	}
+	public void setConfigExprType(String configExprType) {
+		this.configExprType = configExprType;
+	}
+	public String getConfigMatchMethod() {
+		return configMatchMethod;
+	}
+	public void setConfigMatchMethod(String configMatchMethod) {
+		this.configMatchMethod = configMatchMethod;
+	}
+	
 
 }

src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml

@@ -11,10 +11,15 @@
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
     <result column="is_maat" property="isMaat" jdbcType="INTEGER" />
     <result column="region_type" property="regionType" jdbcType="INTEGER" />
+    <result column="config_multi_keywords" property="configMultiKeywords" jdbcType="VARCHAR" />
+    <result column="config_hex" property="configHex" jdbcType="VARCHAR" />
+    <result column="config_expr_type" property="configExprType" jdbcType="VARCHAR" />
+    <result column="config_match_method" property="configMatchMethod" jdbcType="VARCHAR" />
   </resultMap>
   
   <sql id="Base_Column_List" >
     dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
+    ,config_multi_keywords,config_hex,config_expr_type,config_match_method
   </sql>
   <select id="getList" resultMap="BaseResultMap"  >
     select 

src/main/resources/sql/function_region_dict_add_colunm.sql

@@ -0,0 +1,4 @@
+alter table function_region_dict add config_multi_keywords varchar(2)  COMMENT '是否可以多个关键字'
+alter table function_region_dict add config_hex varchar(20)  COMMENT '十六进制 单选：0 非十六进制 大小不敏感 1 十六进制，大小写不敏感 2非十六进制 大小写敏感 默认为0';
+alter table function_region_dict add config_expr_type varchar(20)  COMMENT '是否表达式 ：单选 0 无表达式 1表达式  默认为0';
+alter table function_region_dict add config_match_method varchar(20)  COMMENT '匹配方式 下拉 0：子串匹配；1：右匹配；2：左匹配；3：完全匹配  默认为0 expr_type:0时有意义，其它情况必须置0。';

src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp

@@ -13,6 +13,7 @@
 		<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
 		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
 		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
+		<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configRegionCode }">
 <%-- 	</c:if>
 </c:forEach> --%>
 
@@ -22,7 +23,8 @@
 			onClick="delContent('${tabName}${status.index}','${tabName}Add');" />
 	</div>
 </div>
-<div class="row">
+<c:if test="${!empty region.configDistrict }">
+	<div class="row">
 		<div class="col-md-6">
 			<div class="form-group">
 				<label class="control-label col-md-3"><font color="red">*</font>
@@ -41,15 +43,30 @@
 				<div for="${cfgName}.district"></div>
 			</div>
 		</div>
+	</div>
+</c:if>
+<div class="row">
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>
 			<spring:message code="keywords" /></label>
+			<!-- 此配置的关键词可以输入多个关键词 -->
+			<c:if test="${region.configMultiKeywords eq 1}">
 				<div class="col-md-6">
 					<input class="form-control required tags" type="text" id="tags_${tabName}"
 						name="${cfgName}.cfgKeywords"
 						value="${complexCfg.cfgKeywords}">
 				</div>
+			</c:if>
+			<!-- 此配置的关键词不允许输入多个关键词 -->
+			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+				<div class="col-md-6">
+					<input class="form-control required invisibleChar" type="text"
+						name="${cfgName}.cfgKeywords"
+						value="${complexCfg.cfgKeywords}">
+				</div>
+			</c:if>
+			
 			<div for="${cfgName}.cfgKeywords"></div>
 		</div>
 	</div>
@@ -58,24 +75,46 @@
 <div class="row">
 		<div class="col-md-6">
 			<div class="form-group">
+			
 				<label class="control-label col-md-3"><font color="red">*</font>
 					<spring:message code="expression_type" /></label>
 				<div class="col-md-6">
-				<label class="radio-inline"> <input type="radio"
+					<c:if test="${!empty region.configExprType}">
-					name="${cfgName}.exprType" value="1"
+						<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
+							<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+								<c:if test="${exprTypeC.itemCode eq exprType}">
+									<label class="radio-inline"> 
+										<input type="radio"
+											name="${cfgName}.exprType" value="${exprType }"
 											class="required"
-					<c:if test="${complexCfg.exprType==1}">checked</c:if>> <spring:message
+											<c:if test="${complexCfg.exprType eq exprType || (empty complexCfg.exprType && exprType eq 0)}">
-						code="and_expression" />
+												checked
-				</label> <label class="radio-inline"> <input type="radio"
+											</c:if>
-					name="${cfgName}.exprType" value="0"
+										> 
-					class="required"
+										<spring:message	code="${exprTypeC.itemValue }" />
-					<c:if test="${complexCfg.exprType==0 || complexCfg.exprType==null}">checked</c:if>>
-					<spring:message code="null_expression" />
 									</label>
+								</c:if>
+							</c:forEach>
+						</c:forEach>
+					</c:if>
+					<c:if test="${empty region.configExprType}">
+						<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+								<c:if test="${exprTypeC.itemCode eq 0}">
+									<label class="radio-inline"> 
+										<input type="radio"
+											name="${cfgName}.exprType" value="${exprType }"
+											class="required" checked > 
+										<spring:message	code="${exprTypeC.itemValue }" />
+									</label>
+								</c:if>
+							</c:forEach>
+					</c:if>
 				</div>
 				<div for="${cfgName}.exprType"></div>
+				
 			</div>
 		</div>
+	
 		<div class="col-md-6">
 			<div class="form-group ">
 				<label class="control-label col-md-3"><font color="red">*</font>
@@ -83,9 +122,34 @@
 				<div class="col-md-6">
 					<select name="${cfgName}.matchMethod"
 						class="selectpicker select2 form-control required">
+						<c:if test="${!empty region.configMatchMethod}">
+							<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
 								<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-						<option value="${matchMethodC.itemCode}" <c:if test="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+									<c:if test="${matchMethodC.itemCode eq matchMethod}">
+										<option value="${matchMethodC.itemCode}" 
+										<c:if test="${complexCfg.matchMethod eq matchMethod || (empty complexCfg.matchMethod && matchMethod eq 0)}">
+										selected
+										</c:if>
+										>
+										<spring:message code="${matchMethodC.itemValue}"/>
+										</option>
+									</c:if>
+								
 								</c:forEach> 
+							</c:forEach>
+						</c:if>
+						<c:if test="${empty region.configMatchMethod}">
+							<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+									<c:if test="${matchMethodC.itemCode eq 0}">
+										<option value="${matchMethodC.itemCode}" 
+										selected
+										>
+										<spring:message code="${matchMethodC.itemValue}"/>
+										</option>
+									</c:if>
+								
+								</c:forEach> 
+						</c:if>
 					</select>
 				</div>
 				<div for="${cfgName}.matchMethod"></div>
@@ -93,7 +157,7 @@
 		</div>
 </div>
 <div class="row">
-		
+		<c:if test="${!empty region.configHex}">
 		    <div class="col-md-6">
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
@@ -130,8 +194,35 @@
 		            <div for="${cfgName}.isCaseInsenstive"></div>
 		        </div>
 		    </div>
-	    
+  	</c:if>
+  	<c:if test="${empty region.configHex}"> 
+		<div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isHex" value="0" class="required" checked
+		            		><spring:message code="not_hex"/>
+		            	</label>
 		            </div>
+		            <div for="${cfgName}.isHex"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
+		            			checked
+		            		><spring:message code="case_insenstive"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.isCaseInsenstive"></div>
+		        </div>
+		    </div>
+	</c:if>
+</div>
 <div class="row hidden">
 	<div class="col-md-6">
 		<div class="form-group">
@@ -140,9 +231,33 @@
 			<div class="col-md-6">
 				<select name="${cfgName}.isHexbin"
 					class="selectpicker select2 form-control required">
+					<c:if test="${!empty region.configHex}">
+						<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
 								<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-						<option value="${isHexbinC.itemCode}" <c:if test="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+									<c:if test="${isHexbinC.itemCode eq isHexbin}">
+										<option value="${isHexbinC.itemCode}" 
+										<c:if test="${complexCfg.isHexbin eq isHexbin || (empty complexCfg.isHexbin && isHexbin eq 0)}">
+										selected
+										</c:if>
+										>
+										<spring:message code="${isHexbinC.itemValue}"/>
+										</option>
+									</c:if>
+								
 								</c:forEach> 
+						</c:forEach>
+					</c:if>
+					<c:if test="${!empty region.configHex}"> 
+					
+						<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+							<c:if test="${isHexbinC.itemCode eq 0}">
+								<option value="${isHexbinC.itemCode}"  selected >
+								<spring:message code="${isHexbinC.itemValue}"/>
+								</option>
+							</c:if>
+						</c:forEach> 
+					
+					</c:if>
 				</select>
 			</div>
 			<div for="${cfgName}.isHexbin"></div>