1.common.js增加查询时的compileId 为数字判断2.音视频中添加do_log字段，compileId查询

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

@@ -64,6 +64,7 @@
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
     <result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
     <result column="editor_name" property="editorName" jdbcType="VARCHAR" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   <sql id="AvFileSample_Column" >
     a.CFG_ID, a.SRC_URL,a.SAMPLE_URL, a.SRC_MD5,a.SAMPLE_MD5,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
@@ -77,7 +78,7 @@
     a.CFG_ID, a.description,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
-    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.cfg_type,a.cfg_region_code,a.LEVEL
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.cfg_type,a.cfg_region_code,a.LEVEL,a.do_log
   </sql>
   
   <select id="getAvFileSampleById" resultMap="AvFileSampleMap" parameterType="java.lang.Long" >
@@ -321,7 +322,7 @@
      description,LEVEL,CFG_DESC,ACTION,IS_VALID,IS_AUDIT,
     	CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
    	SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
-    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code
+    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code,do_log
     )values (
       #{description,jdbcType=VARCHAR},#{level,jdbcType=INTEGER},#{cfgDesc,jdbcType=VARCHAR},#{action,jdbcType=INTEGER}, 
     0,0,#{creatorId,jdbcType=INTEGER}, 
@@ -330,7 +331,8 @@
     #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER},
     #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR},    
     #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},
-    #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}
+    #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},
+    #{doLog,jdbcType=INTEGER}
     )
   </insert>
   
@@ -481,6 +483,9 @@
       <if test="level != null" >
         level =  #{level,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null" >
+        do_log =  #{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}

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

@@ -122,6 +122,7 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   
   <resultMap id="BaseStringCfgMap" type="com.nis.domain.configuration.BaseStringCfg" >
@@ -152,6 +153,7 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   
   <sql id="AvVoip_Column" >
@@ -180,13 +182,13 @@
 	,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 	,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
 	r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable
-	,r.area_effective_ids,r.function_id,r.cfg_region_code
+	,r.area_effective_ids,r.function_id,r.cfg_region_code,r.do_log
   </sql>
      <sql id="BaseStringCfg_Column" >
      r.cfg_id,r.cfg_desc,r.cfg_keywords,r.cfg_type,
   r.action,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id,r.edit_time, r.auditor_id,
   r.audit_time,r.service_id,r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
-  r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code
+  r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code,r.do_log
   </sql>
   <!-- voip IP条件查询列表信息 -->
   <select id="findVoipList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -1285,7 +1287,8 @@
     dest_port,
     dest_ip_address,
     cfg_type,
-    cfg_region_code
+    cfg_region_code,
+    do_log
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -1317,7 +1320,9 @@
     	#{destPort,jdbcType=VARCHAR},
     	#{destIpAddress,jdbcType=VARCHAR},
     	#{cfgType,jdbcType=VARCHAR},
-    	#{cfgRegionCode,jdbcType=INTEGER}
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
+    	
     )
   </insert>
   <!-- update av_cont_ip_cfg表信息 -->
@@ -1411,6 +1416,9 @@
       </if>
        <if test="cfgRegionCode != null " >
         cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+       <if test="doLog != null " >
+        do_log = #{doLog,jdbcType=INTEGER},
       </if>
       </trim>
     </set>
@@ -1585,7 +1593,8 @@
 	match_method,
 	is_hexbin,
     cfg_type,
-    cfg_region_code
+    cfg_region_code,
+    do_log
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -1611,7 +1620,8 @@
     	#{matchMethod,jdbcType=INTEGER},
     	#{isHexbin,jdbcType=INTEGER},
     	#{cfgType,jdbcType=VARCHAR},
-    	#{cfgRegionCode,jdbcType=INTEGER}
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
     )
   </insert>
   
@@ -1688,6 +1698,9 @@
       </if>
        <if test="cfgRegionCode != null " >
         cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+       <if test="doLog != null " >
+        do_log = #{doLog,jdbcType=INTEGER},
       </if>
       </trim>
     </set>

src/main/resources/sql/update_cfg_index_info-20180820.sql

@@ -1,2 +1,7 @@
 alter table cfg_index_info add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
-alter table app_policy_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table app_policy_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_cont_ip_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_cont_url_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_pic_ip_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_pic_url_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_sign_sample_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp

@@ -106,6 +106,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
 		}else if("${cfg.srcPort}"){
@@ -33,6 +35,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -102,6 +105,7 @@
                                          
                                         	<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="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 											</form:select>
@@ -275,6 +279,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="client_ip"/></th>
@@ -286,6 +291,7 @@
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -307,6 +313,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
@@ -344,6 +351,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

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

@@ -129,6 +129,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
 								<!-- 配置域类型 -->
 	                   		<c:forEach items="${regionList}" var="region">

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

@@ -10,6 +10,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -31,6 +33,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -100,6 +103,7 @@
                                          
                                         	<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="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 											</form:select>
 									
@@ -271,12 +275,14 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -297,6 +303,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${fn:replace(cfg.cfgKeywords, '***and***', ' ')}"
@@ -325,6 +332,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp

@@ -107,6 +107,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
 		}else if("${cfg.srcPort}"){
@@ -33,6 +35,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -102,6 +105,7 @@
                                          
                                         	<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="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 											</form:select>
@@ -275,6 +279,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="client_ip"/></th>
@@ -286,6 +291,7 @@
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -307,6 +313,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}"  value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
@@ -344,6 +351,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp

@@ -120,6 +120,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
 							<c:forEach items="${regionList}" var="region">
 	                   			<c:if test="${_cfg.functionId eq region.functionId}">

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
 		}else{
@@ -31,6 +33,8 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -100,6 +104,7 @@
                                          
                                         	<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="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 											</form:select>
 									
@@ -272,12 +277,14 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -298,6 +305,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}"  value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${fn:replace(cfg.cfgKeywords, '***and***', ' ')}"
@@ -326,6 +334,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>

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

@@ -152,6 +152,27 @@ $(function(){
 							        </div>
 							    </div>
 							</div>
+							<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
                            <%--  <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
                            <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

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

@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.description}"){
 			$("#intype").val("${cfg.description}");
 		}else if("${cfg.level}"){
@@ -33,6 +35,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -73,7 +76,7 @@
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/signSampleList?functionId=${cfg.functionId}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/audioSignSampleList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -102,6 +105,7 @@
                                          
                                         	<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="description"><spring:message code="sample_sign"></spring:message></form:option>
 												<form:option value="level"><spring:message code="harm_level"></spring:message></form:option>
 											</form:select>
@@ -275,10 +279,12 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="sample_sign"/></th>
 									<th><spring:message code="harm_level"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -299,6 +305,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.description }"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -314,6 +321,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>${cfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>

src/main/webapp/static/global/scripts/common.js

@@ -415,7 +415,31 @@ $(function(){
    initCommIpVal();
 });
 window.onload=function(){
-	//日志查询IP类型增加格式提示
+	// 配置id的搜索下拉框选择切换
+	if ($("#searchForm #seltype").val() == 'compileId') {
+		$("#searchForm #intype").addClass("number");
+	} else {
+		$("#searchForm #intype").removeClass("number");
+	}
+	// reset时去掉number
+	$("#resetBtn").on("click", function() {
+		if ($("#searchForm #seltype").val() == 'compileId') {
+			$("#searchForm #intype").addClass("number");
+		} else {
+			$("#searchForm #intype").removeClass("number");
+		}
+	});
+	// 切换时为compileId加上number
+	$("#searchForm #seltype").on("change", function() {
+		if ($("#searchForm #seltype").val() == 'compileId') {
+			$("#searchForm #intype").addClass("number");
+		} else {
+			$("#searchForm #intype").removeClass("number");
+		}
+	});
+	
+	
+	// 日志查询IP类型增加格式提示
 	$("#searchForm [name='capIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
 	$("#searchForm [name='sIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
 	$("#searchForm [name='dIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");