contip、conturl、picip、picurl功能提交

areainfo界面区域和运营商修改为二选一的

src/main/java/com/nis/domain/configuration/AvContUrlCfg.java

@@ -0,0 +1,18 @@
+package com.nis.domain.configuration;
+
+/**
+ * @ClassName: AvContUrlCfg.java 
+ * @Description: 音视频Cont URL
+ * @author (dell)
+ * @date 2018年2月6日 上午8:29:26
+ * @version V1.0
+ */
+public class AvContUrlCfg extends BaseStringCfg {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1249923766365462700L;
+	
+	
+}

src/main/java/com/nis/domain/configuration/AvPicUrlCfg.java

@@ -0,0 +1,18 @@
+package com.nis.domain.configuration;
+
+/**
+ * @ClassName: AvPicUrlCfg.java 
+ * @Description: 音视频Pic URL
+ * @author (dell)
+ * @date 2018年2月6日 上午8:29:26
+ * @version V1.0
+ */
+public class AvPicUrlCfg extends BaseStringCfg {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1249923766365462700L;
+	
+	
+}

src/main/java/com/nis/web/controller/BaseController.java

@@ -333,6 +333,15 @@ public class BaseController {
 		}
 	}
 	protected void initUpdateFormCondition(Model model,BaseCfg cfg){
+		List<Integer> itTypeList=new ArrayList<Integer>();
+		itTypeList.add(Constants.ITEM_TYPE_AREA);
+		List<SysDictInfo> areas = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
+		model.addAttribute("areas", areas);
+		itTypeList.clear();
+		itTypeList.add(Constants.ITEM_TYPE_ISP);
+		List<SysDictInfo> isps = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
+		model.addAttribute("isps", isps);
+		
 		//查询配置对应的地域ip
 		List<AreaIpCfg> areaCfgs=ipCfgService.getAreaCfgByCompileId(cfg.getCompileId());
 		model.addAttribute("areaCfgs", areaCfgs);
@@ -349,6 +358,7 @@ public class BaseController {
 		//从区域生效ID中获取区域与运营商
 		String areaEffectiveIds=cfg.getAreaEffectiveIds();
 		List<AreaBean> areaIspList=new ArrayList<AreaBean>();
+		//areaEffectiveIds ： 存在冒号，则冒号前为area后为isp；不存在冒号，判断id是否为isp，否则为area
 		if(StringUtils.isNotBlank(areaEffectiveIds)){
 			String[] areaIsps=areaEffectiveIds.split(",");
 			for(String areaIsp:areaIsps){
@@ -357,7 +367,18 @@ public class BaseController {
 					area.setArea(areaIsp.split(":")[0]);
 					area.setIsp(areaIsp.split(":")[1]);
 				}else{
-					area.setArea(areaIsp);
+					boolean isIsp=false;
+					for (SysDictInfo ispDict : isps) {
+						if(ispDict.getItemCode().equals(areaIsp)){
+							area.setIsp(areaIsp);
+							isIsp=true;
+							break;
+						}
+					}
+					if(!isIsp){
+						area.setArea(areaIsp);
+					}
+					
 				}
 				areaIspList.add(area);
 			}
@@ -371,14 +392,6 @@ public class BaseController {
 		model.addAttribute("xzs", xzs);
 		List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("lables", lables);
-		List<Integer> itTypeList=new ArrayList<Integer>();
-		itTypeList.add(Constants.ITEM_TYPE_AREA);
-		List<SysDictInfo> areas = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
-		model.addAttribute("areas", areas);
-		itTypeList.clear();
-		itTypeList.add(Constants.ITEM_TYPE_ISP);
-		List<SysDictInfo> isps = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
-		model.addAttribute("isps", isps);
 		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
 		model.addAttribute("regionList", regionList);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());

src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java

@@ -23,6 +23,7 @@ import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -137,7 +138,7 @@ public class AvContentController extends BaseController  {
 	
 	/*****************************contIp业务***************/
 	//视频文本内容配置列表
-	@RequestMapping(value = {"/contentIpList"})
+	@RequestMapping(value = {"/contIpList"})
 	public String contIpList(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")BaseIpCfg entity){
 		Page<BaseIpCfg> page = avContentCfgService.findContIpPage(new Page<BaseIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
@@ -145,8 +146,8 @@ public class AvContentController extends BaseController  {
 		return "/cfg/av/contIp/contIpList";
 	}
 	//音视频CONTIP新增界面
-	@RequestMapping(value = {"/contentIpForm"})
+	@RequestMapping(value = {"/contIpForm"})
-	@RequiresPermissions(value={"avContentIp:config"})
+	@RequiresPermissions(value={"avContIp:config"})
 	public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseIpCfg cfg){
 		if(!StringUtil.isEmpty(ids)){
 			cfg.setCfgId(Long.parseLong(ids));
@@ -173,19 +174,19 @@ public class AvContentController extends BaseController  {
 			addMessage(model,"save_failed");
 		}
 		
-		return "redirect:" + adminPath +"/ntc/av/contentIpList?functionId="+cfg.getFunctionId();
+		return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+cfg.getFunctionId();
 	}
 	
 	//修改CONTIP例配置状态
 	@RequestMapping(value = {"/updateAvContIpValid"})
-	@RequiresPermissions(value={"avContentIp:config"})
+	@RequiresPermissions(value={"avContIp:config"})
 	public String updateAvContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
 		avContentCfgService.updateContIpValid(isAudit,isValid,ids,functionId);
-		return "redirect:" + adminPath +"/ntc/av/contentIpList?functionId="+functionId;
+		return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+functionId;
 	}
 	//修改CONTIP配置审核
 	@RequestMapping(value = {"/auditAvContIp"})
-	@RequiresPermissions(value={"avContentIp:audit"})
+	@RequiresPermissions(value={"avContIp:audit"})
 	public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId){
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
@@ -195,7 +196,7 @@ public class AvContentController extends BaseController  {
 			}
 			
 		}
-		return "redirect:" + adminPath +"/ntc/av/contentIpList?functionId="+functionId;
+		return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+functionId;
 	}
 	/*****************************contIp业务***************/
 	
@@ -263,4 +264,133 @@ public class AvContentController extends BaseController  {
 	}
 	/*****************************picIp业务***************/
 	
+	
+	/*****************************contUrl业务***************/
+	//视频文本内容配置列表
+	@RequestMapping(value = {"/contUrlList"})
+	public String contUrlList(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")BaseStringCfg entity){
+		Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model);
+		return "/cfg/av/contUrl/contUrlList";
+	}
+	//音视频CONTUrl新增界面
+	@RequestMapping(value = {"/contUrlForm"})
+	@RequiresPermissions(value={"avContUrl:config"})
+	public String contUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){
+		if(!StringUtil.isEmpty(ids)){
+			cfg.setCfgId(Long.parseLong(ids));
+			cfg = avContentCfgService.getContUrlCfgById(cfg);
+			initUpdateFormCondition(model, cfg);
+		}else{
+			initFormCondition(model,cfg);
+		}
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/av/contUrl/contUrlForm";
+	}
+	
+	//保存CONTUrl信息
+	@RequestMapping(value = {"/saveContUrl"})
+	public String saveContUrl(Model model,HttpServletRequest request,HttpServletResponse response,
+			@ModelAttribute("cfg")BaseStringCfg cfg,
+			@ModelAttribute("areaCfgIds")String areaCfgIds){
+		try{
+			avContentCfgService.saveOrUpdateContUrl(cfg,areaCfgIds);
+			addMessage(model,"save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			addMessage(model,"save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();
+	}
+	
+	//修改CONTUrl例配置状态
+	@RequestMapping(value = {"/updateAvContUrlValid"})
+	@RequiresPermissions(value={"avContUrl:config"})
+	public String updateAvContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		avContentCfgService.updateContUrlValid(isAudit,isValid,ids,functionId);
+		return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+functionId;
+	}
+	//修改CONTUrl配置审核
+	@RequestMapping(value = {"/auditAvContUrl"})
+	@RequiresPermissions(value={"avContUrl:audit"})
+	public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime);
+			}
+			
+		}
+		return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+functionId;
+	}
+	/*****************************contUrl业务***************/
+	
+	
+	/*****************************picUrl业务***************/
+	//视频文本内容配置列表
+	@RequestMapping(value = {"/picUrlList"})
+	public String picUrlList(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")BaseStringCfg entity){
+		Page<BaseStringCfg> page = avContentCfgService.findPicUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model);
+		return "/cfg/av/picUrl/picUrlList";
+	}
+	//音视频CONTUrl新增界面
+	@RequestMapping(value = {"/picUrlForm"})
+	@RequiresPermissions(value={"avPicUrl:config"})
+	public String picUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){
+		if(!StringUtil.isEmpty(ids)){
+			cfg.setCfgId(Long.parseLong(ids));
+			cfg = avContentCfgService.getPicUrlCfgById(cfg);
+			initUpdateFormCondition(model, cfg);
+		}else{
+			initFormCondition(model,cfg);
+		}
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/av/picUrl/picUrlForm";
+	}
+	
+	//保存CONTUrl信息
+	@RequestMapping(value = {"/savePicUrl"})
+	public String savePicUrl(Model model,HttpServletRequest request,HttpServletResponse response,
+			@ModelAttribute("cfg")BaseStringCfg cfg,
+			@ModelAttribute("areaCfgIds")String areaCfgIds){
+		try{
+			avContentCfgService.saveOrUpdatePicUrl(cfg,areaCfgIds);
+			addMessage(model,"save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			addMessage(model,"save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+cfg.getFunctionId();
+	}
+	
+	//修改CONTUrl例配置状态
+	@RequestMapping(value = {"/updateAvPicUrlValid"})
+	@RequiresPermissions(value={"avPicUrl:config"})
+	public String updateAvPicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		avContentCfgService.updatePicUrlValid(isAudit,isValid,ids,functionId);
+		return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId;
+	}
+	//修改CONTUrl配置审核
+	@RequestMapping(value = {"/auditAvPicUrl"})
+	@RequiresPermissions(value={"avPicUrl:audit"})
+	public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime);
+			}
+			
+		}
+		return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId;
+	}
+	/*****************************picUrl业务***************/
 }

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

@@ -3,24 +3,18 @@ package com.nis.web.dao.configuration;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.AvContIpCfg;
-import com.nis.domain.configuration.AvFileSampleCfg;
-import com.nis.domain.configuration.AvSignSampleCfg;
-import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
 
 @MyBatisDao
 public interface AvContentCfgDao {
 	public List<CfgIndexInfo> findVoipList(CfgIndexInfo entity) ;
-	public List<BaseIpCfg> findIpList(BaseIpCfg entity) ;
-	public List<BaseIpCfg> getIpList(BaseIpCfg entity) ;
 	public List<AvVoipIpCfg> findVoipIpCfgList(CfgIndexInfo entity);
 	public List<AvVoipAccountCfg> findVoipAccountCfgList(CfgIndexInfo entity);
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity);
@@ -32,7 +26,16 @@ public interface AvContentCfgDao {
 	public void updateAvVoipAccount(CfgIndexInfo entity);
 	public void deleteAvVoipIp(CfgIndexInfo entity);
 	public void deleteAvVoipAccount(CfgIndexInfo entity);
+	
 	public BaseIpCfg findIpCfgById(BaseIpCfg entity) ;
 	public void insertIp(BaseIpCfg entity);
 	public void updateIp(BaseIpCfg entity);
+	public List<BaseIpCfg> findIpList(BaseIpCfg entity) ;
+	public List<BaseIpCfg> getIpList(BaseIpCfg entity) ;
+	
+	public BaseStringCfg findStringCfgById(BaseStringCfg entity) ;
+	public void insertString(BaseStringCfg entity);
+	public void updateString(BaseStringCfg entity);
+	public List<BaseStringCfg> findStringList(BaseStringCfg entity) ;
+	public List<BaseStringCfg> getStringList(BaseStringCfg entity) ;
 }

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

@@ -123,6 +123,36 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap>
   
+  <resultMap id="BaseStringCfgMap" type="com.nis.domain.configuration.BaseStringCfg" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="cfg_keywords" property="cfgKeywords" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="classify" property="classify" jdbcType="VARCHAR" />
+    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+    <result column="lable" property="lable" jdbcType="VARCHAR" />
+    <result column="expr_type " property="exprType" jdbcType="INTEGER" />
+    <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
+    <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
+    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <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" />
+  </resultMap>
+  
   <sql id="AvVoip_Column" >
     r.CFG_ID,r.CFG_DESC,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,
@@ -151,6 +181,12 @@
 	r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable
 	,r.area_effective_ids,r.function_id,r.cfg_region_code
   </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
+  </sql>
   <!-- voip条件查询列表信息 -->
   <select id="findVoipList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
 		SELECT 
@@ -803,6 +839,7 @@
       	</if>
     </where>
   </delete>
+<!--**********************************BaseIpCfg*******************************************************-->
 <!-- avContIp条件查询列表信息 -->
   <select id="findIpList" resultMap="AvContIpCfgMap" parameterType="com.nis.domain.configuration.BaseIpCfg" >
 		SELECT 
@@ -1120,4 +1157,275 @@
 			</choose>
   		</where>
   </select>
+  
+<!--**********************************BaseStringCfg*******************************************************-->
+<!-- avContIp条件查询列表信息 -->
+   <select id="findStringList" resultMap="BaseStringCfgMap" parameterType="com.nis.domain.configuration.BaseStringCfg" >
+		SELECT 
+	    <include refid="BaseStringCfg_Column" />
+	    <trim prefix="," prefixOverrides=",">
+			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
+			,ri.request_title as requestName
+		</trim>
+	    FROM ${tableName} r
+	    left join sys_user s on r.creator_id=s.id
+		left join sys_user e on r.editor_id=e.id
+		left join sys_user u on r.auditor_id=u.id
+		left join request_info ri on r.request_id=ri.id
+		
+	    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
+	 		<if test="cfgId != null">
+	   			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	   		</if>
+	    	<if test="cfgDesc != null and cfgDesc != ''">
+	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="action != null">
+	    		AND r.ACTION=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="serviceId != null">
+	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="requestId != null">
+	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileId != null">
+	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isAreaEffective != null">
+	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="classify != null and classify != ''">
+	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="attribute != null and attribute != ''">
+	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="lable != null and lable != ''">
+	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+    		<if test="cfgKeywords != null  and cfgKeywords != ''">
+    			and r.cfg_keywords like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
+    		</if>
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY r.CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
+  
+  <!--    根据cfg_id获取avContUrlCfg信息-->
+  <select id="findStringCfgById" resultMap="BaseStringCfgMap" parameterType="com.nis.domain.configuration.BaseStringCfg">
+		select 
+			<include refid="BaseStringCfg_Column" />
+		from ${tableName} r
+		<where>
+  			<if test="cfgId != null">
+  				and r.cfg_id=#{cfgId,jdbcType=INTEGER}
+	   		</if>
+	   		<choose>
+				<when test="isValid != null">
+					and r.is_valid=#{isValid,jdbcType=INTEGER}
+				</when>
+				<otherwise>
+					and r.is_valid != -1
+				</otherwise>
+			</choose>
+  		</where>
+		
+  </select>
+  
+  
+ <!-- insert AV_cont_IP_CFG表信息-->
+  <insert id="insertString" parameterType="com.nis.domain.configuration.BaseStringCfg" >
+    insert into ${tableName} (
+     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_keywords,
+    expr_type,
+	match_method,
+	is_hexbin,
+    cfg_type,
+    cfg_region_code
+    )values (
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	0,
+    	0,
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{compileId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+   	 	#{cfgKeywords,jdbcType=VARCHAR},
+    	#{exprType,jdbcType=INTEGER},
+    	#{matchMethod,jdbcType=INTEGER},
+    	#{isHexbin,jdbcType=INTEGER},
+    	#{cfgType,jdbcType=VARCHAR},
+    	#{cfgRegionCode,jdbcType=INTEGER}
+    )
+  </insert>
+  
+  <!--update av_cont_ip_cfg表信息-->
+  <update id="updateString" parameterType="com.nis.domain.configuration.BaseStringCfg" >
+    update ${tableName}
+    <set >
+      <trim suffixOverrides=",">
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="action != null" >
+        action = #{action,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null" >
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+       <if test="editTime != null  and editTime != ''" >
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorId != null" >
+        AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
+      </if>
+       <if test="auditTime != null  and auditTime != ''" >
+     	AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+       <if test="compileId != null" >
+     	COMPILE_ID = #{compileId,jdbcType=TIMESTAMP},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="isAreaEffective != null" >
+        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null and classify != ''" >
+        classify = #{classify,jdbcType=VARCHAR},
+      </if>
+      <if test="attribute != null and attribute != ''" >
+        attribute = #{attribute,jdbcType=VARCHAR},
+      </if>
+      <if test="lable != null and lable != ''" >
+        lable = #{lable,jdbcType=VARCHAR},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+      </if>
+      <if test="functionId != null" >
+        function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="serviceId != null" >
+        service_id =  #{serviceId,jdbcType=INTEGER},
+      </if>
+      <if test="cfgKeywords != null and cfgKeywords != ''" >
+        cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR},
+      </if>
+      <if test="exprType != null" >
+        expr_type = #{exprType,jdbcType=INTEGER},
+      </if>
+      <if test="matchMethod != null" >
+        match_method = #{matchMethod,jdbcType=INTEGER},
+      </if>
+      <if test="isHexbin != null" >
+        is_hexbin = #{isHexbin,jdbcType=INTEGER},
+      </if>
+       <if test="cfgType != null and cfgType != ''" >
+        cfg_type = #{cfgType,jdbcType=VARCHAR},
+      </if>
+       <if test="cfgRegionCode != null " >
+        cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+      </trim>
+    </set>
+    <where>
+    	<if test="cfgId != null" >
+        	and cfg_id =  #{cfgId,jdbcType=INTEGER}
+      	</if>
+    	<if test="functionId != null" >
+        	and function_id =  #{functionId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
+  <select id="getStringList" resultMap="BaseStringCfgMap" parameterType="com.nis.domain.configuration.BaseStringCfg">
+		select 
+			<include refid="BaseStringCfg_Column" />
+		from ${tableName} r
+		<where>
+  			<if test="cfgId != null">
+  				and r.cfg_id=#{cfgId,jdbcType=INTEGER}
+	   		</if>
+	   		<choose>
+				<when test="isValid != null">
+					and r.is_valid=#{isValid,jdbcType=INTEGER}
+				</when>
+				<otherwise>
+					and r.is_valid != -1
+				</otherwise>
+			</choose>
+  		</where>
+  </select>
 </mapper>

src/main/java/com/nis/web/service/configuration/AvContentCfgService.java

@@ -17,6 +17,7 @@ import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.ToMaatBean;
@@ -118,10 +119,12 @@ public class AvContentCfgService extends BaseService{
 			if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
 				StringBuffer areaEffectiveIds=new StringBuffer();
 				for(int i=0;i<areaIsps.size();i++){
-					if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
+					if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
-						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
+						areaEffectiveIds.append(areaIsps.get(i).getIsp());
-					}else{
+					}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
 						areaEffectiveIds.append(areaIsps.get(i).getArea());
+					}else{
+						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
 					}
 					if(i!=areaIsps.size()-1){
 						areaEffectiveIds.append(",");
@@ -481,10 +484,12 @@ public class AvContentCfgService extends BaseService{
 			if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
 				StringBuffer areaEffectiveIds=new StringBuffer();
 				for(int i=0;i<areaIsps.size();i++){
-					if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
+					if(StringUtils.isBlank(areaIsps.get(i).getArea())){
-						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
+						areaEffectiveIds.append(areaIsps.get(i).getIsp());
-					}else{
+					}else if(StringUtils.isBlank(areaIsps.get(i).getIsp())){
 						areaEffectiveIds.append(areaIsps.get(i).getArea());
+					}else{
+						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
 					}
 					if(i!=areaIsps.size()-1){
 						areaEffectiveIds.append(",");
@@ -647,12 +652,12 @@ public class AvContentCfgService extends BaseService{
 		
 		entity.setCfgId(Long.parseLong(id));
 		entity = avContentCfgDao.findIpCfgById(entity);
+		entity.setTableName("av_cont_ip_cfg");
 		entity.setIsAudit(isAudit);
 		entity.setIsValid(isValid);
 		entity.setAuditorId(UserUtils.getUser().getId());
 		entity.setAuditTime(auditTime);
 		
-		
 		avContentCfgDao.updateIp(entity);
 		AreaIpCfg areaIpCfg=new AreaIpCfg();
 		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
@@ -785,10 +790,12 @@ public class AvContentCfgService extends BaseService{
 			if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
 				StringBuffer areaEffectiveIds=new StringBuffer();
 				for(int i=0;i<areaIsps.size();i++){
-					if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
+					if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
-						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
+						areaEffectiveIds.append(areaIsps.get(i).getIsp());
-					}else{
+					}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
 						areaEffectiveIds.append(areaIsps.get(i).getArea());
+					}else{
+						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
 					}
 					if(i!=areaIsps.size()-1){
 						areaEffectiveIds.append(",");
@@ -950,6 +957,7 @@ public class AvContentCfgService extends BaseService{
 		
 		entity.setCfgId(Long.parseLong(id));
 		entity = avContentCfgDao.findIpCfgById(entity);
+		entity.setTableName("av_cont_ip_cfg");
 		entity.setIsAudit(isAudit);
 		entity.setIsValid(isValid);
 		entity.setAuditorId(UserUtils.getUser().getId());
@@ -1045,5 +1053,546 @@ public class AvContentCfgService extends BaseService{
 			//logger.info("http配置取消配置响应信息："+result.getMsg());
 		}
 	}
-	/********************************contIp业务*********************************/
+	/********************************picIp业务*********************************/
+	
+	
+	
+	/********************************contUrl业务*********************************/
+	/**
+	 * picIp查询分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<BaseStringCfg> findContUrlPage(Page page, BaseStringCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		entity.setTableName("av_cont_url_cfg");
+		List<BaseStringCfg> list=avContentCfgDao.findStringList(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	/**
+	 * ContUrl根据id查询contIpCfg信息
+	 * @param entity
+	 * @return
+	 */
+	public BaseStringCfg getContUrlCfgById(BaseStringCfg entity) {
+		entity.setTableName("av_cont_url_cfg");
+		return avContentCfgDao.findStringCfgById(entity);
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdateContUrl(BaseStringCfg entity,String areaCfgIds){
+		Date createTime=new Date();
+		entity.setTableName("av_cont_url_cfg");
+		//区域IPsetAreaEffectiveIds设置
+		List<AreaIpCfg> areaCfg=entity.getAreaCfg();
+		List<AreaBean> areaIsps=entity.getAreaIsp();
+		if(Constants.IS_AREA_EFFECTIVE_NO==entity.getIsAreaEffective()){
+			entity.setAreaEffectiveIds("");
+			entity.setAreaType(null);
+		}else if(Constants.IS_AREA_EFFECTIVE_YES==entity.getIsAreaEffective()){
+			if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
+				StringBuffer areaEffectiveIds=new StringBuffer();
+				for(int i=0;i<areaIsps.size();i++){
+					if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
+						areaEffectiveIds.append(areaIsps.get(i).getIsp());
+					}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
+						areaEffectiveIds.append(areaIsps.get(i).getArea());
+					}else{
+						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
+					}
+					if(i!=areaIsps.size()-1){
+						areaEffectiveIds.append(",");
+					}
+				}
+				entity.setAreaEffectiveIds(areaEffectiveIds.toString());
+			}else if(Constants.AREA_EFFECTIVE_TYPE_AREA_IP==entity.getAreaType()&&areaCfg!=null&&areaCfg.size()>0){
+				entity.setAreaEffectiveIds("");
+			}
+		}
+		
+		//新增
+		if(entity.getCfgId()==null){
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			//调用服务接口获取compileId
+			List<Integer> compileIds = new ArrayList<Integer>();
+			try {
+				compileIds = ConfigServiceUtil.getId(1,1);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+				entity.setCompileId(compileIds.get(0));
+				
+				//保存区域IP信息
+				if(entity.getAreaCfg()!=null&&entity.getAreaCfg().size()>0){
+					for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+						});
+						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+					}
+				}
+				
+				//保存cfgIndexInfo
+				avContentCfgDao.insertString(entity);
+			}else{
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+			}
+			
+			//修改
+		}else{
+			Date editTime=new Date();
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			
+			areaCfgIds=!StringUtil.isEmpty(areaCfgIds)? ","+areaCfgIds:"";
+			
+			if(!StringUtil.isEmpty(entity.getAreaCfg())){
+				for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+					if(!StringUtil.isEmpty(areaIpCfg.getCfgId())){
+						if(areaCfgIds.contains(","+areaIpCfg.getCfgId()+",")){
+							areaCfgIds=areaCfgIds.replace(areaIpCfg.getCfgId()+",", "");
+						}
+						//修改
+						entity.setEditorId(UserUtils.getUser().getId());
+						entity.setEditTime(editTime);
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+								,"cfgId"
+						});
+						areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+					}else{
+						//新增
+						entity.setCreatorId(UserUtils.getUser().getId());
+						entity.setCreateTime(createTime);
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+						});
+						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+					}
+				}
+			}
+			//delete 真是删除areaIpCfg信息
+			if(!StringUtil.isEmpty(areaCfgIds.replaceAll(",", ""))){
+				areaCfgIds=areaCfgIds.substring(1,areaCfgIds.length());
+				for (String cfgId : areaCfgIds.split(",")) {
+					AreaIpCfg areaIpCfg=new AreaIpCfg();
+					areaIpCfg.setCfgId(Long.parseLong(cfgId));
+					areaIpCfgDao.deleteAreaIpCfgByCfgId(areaIpCfg);
+				}
+			}
+			
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			entity.setTableName("av_cont_url_cfg");
+			avContentCfgDao.updateString(entity);
+		}
+	}
+	
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void updateContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		BaseStringCfg entity = new BaseStringCfg();
+		entity.setTableName("av_cont_url_cfg");
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			avContentCfgDao.updateString(entity);
+			AreaIpCfg areaIpCfg=new AreaIpCfg();
+			BeanUtils.copyProperties(entity, areaIpCfg);
+			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditContUrl(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
+		BaseStringCfg entity = new BaseStringCfg();
+		entity.setTableName("av_cont_url_cfg");
+		List<BaseStringCfg> list = new ArrayList();
+		List<AreaIpCfg> areaIpCfgList = new ArrayList();
+		
+		entity.setCfgId(Long.parseLong(id));
+		entity = avContentCfgDao.findStringCfgById(entity);
+		entity.setTableName("av_cont_url_cfg");
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		
+		
+		avContentCfgDao.updateString(entity);
+		AreaIpCfg areaIpCfg=new AreaIpCfg();
+		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+				,"cfgType"
+				,"cfgId"
+		});
+		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+		
+		list=avContentCfgDao.getStringList(entity);
+		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();
+		
+		if(isAudit==1){
+			if(!StringUtil.isEmpty(list)){
+				Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
+				groupRelationList=strMap.get("groupList");
+				strRegionList=strMap.get("dstList");
+			}
+			
+			if(!StringUtil.isEmpty(areaIpCfgList)){
+				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
+				groupRelationList=areaMap.get("groupList");
+				areaIpRegionList=areaMap.get("dstList");
+			}
+		}
+		
+		//构造提交综合服务参数格式，一条配置提交一次综合服务
+		if(isAudit==1){
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("contIp配置下发配置参数："+json);
+			//TODO 调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			//logger.info("contIp配置下发响应信息："+result.getMsg());
+			
+		}else if(isAudit==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("contIp配置下发配置参数："+json);
+			//调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.put(json,1);
+			//logger.info("http配置取消配置响应信息："+result.getMsg());
+		}
+	}
+	/********************************contUrl业务*********************************/
+	
+	
+	/********************************picUrl业务*********************************/
+	/**
+	 * picIp查询分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<BaseStringCfg> findPicUrlPage(Page page, BaseStringCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		entity.setTableName("av_pic_url_cfg");
+		List<BaseStringCfg> list=avContentCfgDao.findStringList(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	/**
+	 * PicUrl根据id查询picIpCfg信息
+	 * @param entity
+	 * @return
+	 */
+	public BaseStringCfg getPicUrlCfgById(BaseStringCfg entity) {
+		entity.setTableName("av_pic_url_cfg");
+		return avContentCfgDao.findStringCfgById(entity);
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdatePicUrl(BaseStringCfg entity,String areaCfgIds){
+		Date createTime=new Date();
+		entity.setTableName("av_pic_url_cfg");
+		//区域IPsetAreaEffectiveIds设置
+		List<AreaIpCfg> areaCfg=entity.getAreaCfg();
+		List<AreaBean> areaIsps=entity.getAreaIsp();
+		if(Constants.IS_AREA_EFFECTIVE_NO==entity.getIsAreaEffective()){
+			entity.setAreaEffectiveIds("");
+			entity.setAreaType(null);
+		}else if(Constants.IS_AREA_EFFECTIVE_YES==entity.getIsAreaEffective()){
+			if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
+				StringBuffer areaEffectiveIds=new StringBuffer();
+				for(int i=0;i<areaIsps.size();i++){
+					if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
+						areaEffectiveIds.append(areaIsps.get(i).getIsp());
+					}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
+						areaEffectiveIds.append(areaIsps.get(i).getArea());
+					}else{
+						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
+					}
+					if(i!=areaIsps.size()-1){
+						areaEffectiveIds.append(",");
+					}
+				}
+				entity.setAreaEffectiveIds(areaEffectiveIds.toString());
+			}else if(Constants.AREA_EFFECTIVE_TYPE_AREA_IP==entity.getAreaType()&&areaCfg!=null&&areaCfg.size()>0){
+				entity.setAreaEffectiveIds("");
+			}
+		}
+		
+		//新增
+		if(entity.getCfgId()==null){
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			//调用服务接口获取compileId
+			List<Integer> compileIds = new ArrayList<Integer>();
+			try {
+				compileIds = ConfigServiceUtil.getId(1,1);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+				entity.setCompileId(compileIds.get(0));
+				
+				//保存区域IP信息
+				if(entity.getAreaCfg()!=null&&entity.getAreaCfg().size()>0){
+					for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+						});
+						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+					}
+				}
+				
+				//保存cfgIndexInfo
+				avContentCfgDao.insertString(entity);
+			}else{
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+			}
+			
+			//修改
+		}else{
+			Date editTime=new Date();
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			
+			areaCfgIds=!StringUtil.isEmpty(areaCfgIds)? ","+areaCfgIds:"";
+			
+			if(!StringUtil.isEmpty(entity.getAreaCfg())){
+				for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+					if(!StringUtil.isEmpty(areaIpCfg.getCfgId())){
+						if(areaCfgIds.contains(","+areaIpCfg.getCfgId()+",")){
+							areaCfgIds=areaCfgIds.replace(areaIpCfg.getCfgId()+",", "");
+						}
+						//修改
+						entity.setEditorId(UserUtils.getUser().getId());
+						entity.setEditTime(editTime);
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+								,"cfgId"
+						});
+						areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+					}else{
+						//新增
+						entity.setCreatorId(UserUtils.getUser().getId());
+						entity.setCreateTime(createTime);
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+						});
+						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+					}
+				}
+			}
+			//delete 真是删除areaIpCfg信息
+			if(!StringUtil.isEmpty(areaCfgIds.replaceAll(",", ""))){
+				areaCfgIds=areaCfgIds.substring(1,areaCfgIds.length());
+				for (String cfgId : areaCfgIds.split(",")) {
+					AreaIpCfg areaIpCfg=new AreaIpCfg();
+					areaIpCfg.setCfgId(Long.parseLong(cfgId));
+					areaIpCfgDao.deleteAreaIpCfgByCfgId(areaIpCfg);
+				}
+			}
+			
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			entity.setTableName("av_pic_url_cfg");
+			avContentCfgDao.updateString(entity);
+		}
+	}
+	
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void updatePicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		BaseStringCfg entity = new BaseStringCfg();
+		entity.setTableName("av_pic_url_cfg");
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			avContentCfgDao.updateString(entity);
+			AreaIpCfg areaIpCfg=new AreaIpCfg();
+			BeanUtils.copyProperties(entity, areaIpCfg);
+			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditPicUrl(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
+		BaseStringCfg entity = new BaseStringCfg();
+		entity.setTableName("av_pic_url_cfg");
+		List<BaseStringCfg> list = new ArrayList();
+		List<AreaIpCfg> areaIpCfgList = new ArrayList();
+		
+		entity.setCfgId(Long.parseLong(id));
+		entity = avContentCfgDao.findStringCfgById(entity);
+		entity.setTableName("av_pic_url_cfg");
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		
+		
+		avContentCfgDao.updateString(entity);
+		AreaIpCfg areaIpCfg=new AreaIpCfg();
+		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+				,"cfgType"
+				,"cfgId"
+		});
+		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+		
+		list=avContentCfgDao.getStringList(entity);
+		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();
+		
+		if(isAudit==1){
+			if(!StringUtil.isEmpty(list)){
+				Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
+				groupRelationList=strMap.get("groupList");
+				strRegionList=strMap.get("dstList");
+			}
+			
+			if(!StringUtil.isEmpty(areaIpCfgList)){
+				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
+				groupRelationList=areaMap.get("groupList");
+				areaIpRegionList=areaMap.get("dstList");
+			}
+		}
+		
+		//构造提交综合服务参数格式，一条配置提交一次综合服务
+		if(isAudit==1){
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("picUrl配置下发配置参数："+json);
+			//TODO 调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			//logger.info("picUrl配置下发响应信息："+result.getMsg());
+			
+		}else if(isAudit==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("picUrl配置下发配置参数："+json);
+			//调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.put(json,1);
+			//logger.info("http配置取消配置响应信息："+result.getMsg());
+		}
+	}
+	/********************************picUrl业务*********************************/
 }

src/main/webapp/WEB-INF/include/form/areaInfo.jsp

@@ -14,18 +14,13 @@ $(function(){
            	<label class="radio-inline">
            		<input type="radio" name="isAreaEffective" value="1" class="required"
            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-           			<c:if test="${action==2}">disabled</c:if>
            		><spring:message code="yes"/>
            	</label>
            	<label class="radio-inline">
            		<input type="radio" name="isAreaEffective" value="0" class="required"
            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-           			<c:if test="${action==2}">disabled</c:if>
            		><spring:message code="no"/>
            	</label>
-           	<c:if test="${action==2}">
-			<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
-			</c:if>
            </div>
            <div for="isAreaEffective"></div>
        </div>
@@ -57,9 +52,9 @@ $(function(){
 		<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="area"/></label>
+		        	<label class="control-label col-md-3"><spring:message code="area"/></label>
 					<div class="col-md-6">
-						<select name="areaCode" class="form-control required" data-live-search="true" data-live-search-placeholder="search" >
+						<select name="areaCode" class="form-control chooseAreaOrIsp" data-live-search="true" data-live-search-placeholder="search" >
 							<option value="" ><spring:message code="select"/></option>
 							<c:forEach items="${areas}" var="area">
 								<option value="${area.itemCode}">${area.itemValue}</option>
@@ -94,9 +89,9 @@ $(function(){
 			<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="area"/></label>
+			        	<label class="control-label col-md-3"><spring:message code="area"/></label>
 						<div class="col-md-6">
-							<select name="areaIsp[${status.index}].area" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search" >
+							<select name="areaIsp[${status.index}].area" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search" >
 								<option value="" ><spring:message code="select"/></option>
 								<c:forEach items="${areas}" var="area">
 									<option value="${area.itemCode}"
@@ -150,7 +145,7 @@ $(function(){
 		            
 		            	 <select id="_areaCfg.ipType" class="show-tick form-control required">
 		                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-							<option value="${ipTypeC.itemCode}">${ipTypeC.itemValue}</option>
+							<option value="${ipTypeC.itemCode}" <c:if test="${ipTypeC.itemCode==_areaCfg.ipType || (_areaCfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>>${ipTypeC.itemValue}</option>
                 			</c:forEach>
 		                 </select>
 		            </div>
@@ -164,9 +159,9 @@ $(function(){
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
 		            <div class="col-md-6">
 		            	 <select id="_areaCfg.ipPattern" class="show-tick form-control required">
-		                   <option value="1"><spring:message code="ip_subnet"/></option>
+		                   <option value="1"  <c:if test="${_areaCfg.ipPattern==1 }">selected</c:if>><spring:message code="ip_subnet"/></option>
-		                   <option value="2"><spring:message code="ip_range"/></option>
+		                   <option value="2" <c:if test="${_areaCfg.ipPattern==1 }">selected</c:if>><spring:message code="ip_range"/></option>
-		                   <option value="3"><spring:message code="ip"/></option>
+		                   <option value="3" <c:if test="${_areaCfg.ipPattern==3 || _areaCfg.ipPattern==null}">selected</c:if>><spring:message code="ip"/></option>
 		                 </select>
 		            </div>
 		            <div for="_areaCfg.ipPattern"></div>
@@ -176,7 +171,7 @@ $(function(){
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
 		            <div class="col-md-6">
-		                 <input id="_areaCfg.srcIpAddress" class="form-control required" type="text" value="${_areaCfg.srcIpAddress}">
+		                 <input id="_areaCfg.srcIpAddress" class="form-control required ipCheck" type="text" value="${_areaCfg.srcIpAddress}">
 		            </div>
 		            <div for="_areaCfg.srcIpAddress"></div>
 		        </div>
@@ -189,8 +184,8 @@ $(function(){
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
 		            <div class="col-md-6">
 		            	 <select id="_areaCfg.portPattern" class="show-tick form-control required">
-		                   <option value="1"><spring:message code="port"/></option>
+		                   <option value="1" <c:if test="${_areaCfg.portPattern==1 || _areaCfg.portPattern==null}">selected</c:if>><spring:message code="port"/></option>
-		                   <option value="2"><spring:message code="port_mask"/></option>
+		                   <option value="2" <c:if test="${_areaCfg.portPattern==1}">selected</c:if>><spring:message code="port_mask"/></option>
 		                 </select>
 		            </div>
 		            <div for="_areaCfg.portPattern"></div>
@@ -200,7 +195,7 @@ $(function(){
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
 		            <div class="col-md-6">
-		                 <input id="_areaCfg.srcPort" class="form-control required" type="text" value="${_areaCfg.srcPort}">
+		                 <input id="_areaCfg.srcPort" class="form-control required portCheck" type="text" value="${_areaCfg.srcPort}">
 		            </div>
 		            <div for="_areaCfg.srcPort"></div>
 		        </div>
@@ -211,7 +206,7 @@ $(function(){
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
 		            <div class="col-md-6">
-		                 <input id="_areaCfg.destIpAddress" class="form-control required" type="text" value="${_areaCfg.destIpAddress}">
+		                 <input id="_areaCfg.destIpAddress" class="form-control required ipCheck" type="text" value="${_areaCfg.destIpAddress}">
 		            </div>
 		            <div for="_areaCfg.destIpAddress"></div>
 		        </div>
@@ -220,7 +215,7 @@ $(function(){
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 		            <div class="col-md-6">
-		                 <input id="_areaCfg.destPort" class="form-control required" type="text" value="${_areaCfg.destPort}">
+		                 <input id="_areaCfg.destPort" class="form-control required portCheck" type="text" value="${_areaCfg.destPort}">
 		            </div>
 		            <div for="_areaCfg.destPort"></div>
 		        </div>
@@ -235,7 +230,7 @@ $(function(){
 		                   <option value=""><spring:message code="select"/></option>
 		                   <option value="6" <c:if test="${_areaCfg.protocol==6}">selected</c:if>>TCP</option>
 		                   <option value="17" <c:if test="${_areaCfg.protocol==17}">selected</c:if> >UDP</option>
-		                   <option value="0" <c:if test="${_areaCfg.protocol==0}">selected</c:if> ><spring:message code="arbitrary"/></option>
+		                   <option value="0" <c:if test="${_areaCfg.protocol==0 || _areaCfg.protocol==null}">selected</c:if> ><spring:message code="arbitrary"/></option>
 		                </select>
 		                <input type="hidden" id="_areaCfg.protocolId" value="${_areaCfg.protocolId}">
 		            </div>
@@ -275,7 +270,7 @@ $(function(){
 		            <div class="col-md-6">
 		                 <select name="areaCfg[${status.index}].ipType" class="selectpicker show-tick form-control required">
 		                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
-							<option value="${ipType.itemCode}" <c:if test="${areaCfg.ipType==ipType.itemCode}">selected</c:if> >${ipType.itemValue}</option>
+							<option value="${ipType.itemCode}" <c:if test="${areaCfg.ipType==ipType.itemCode || (areaCfg.ipType==null && ipType.itemCode==4)}">selected</c:if> >${ipType.itemValue}</option>
                 			</c:forEach>
 		                 </select>
 		            </div>
@@ -324,7 +319,7 @@ $(function(){
 		        <div class="form-group">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
 		            <div class="col-md-6">
-		                <input name="areaCfg[${status.index}].srcPort" class="form-control required checkPort" type="text" value="${areaCfg.srcPort}">
+		                <input name="areaCfg[${status.index}].srcPort" class="form-control required portCheck" type="text" value="${areaCfg.srcPort}">
 		            </div>
 		            <div for="areaCfg[${status.index}].srcPort"></div>
 		        </div>

src/main/webapp/WEB-INF/include/form/ipInfo.jsp

@@ -1,7 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <h3 class="form-section"><spring:message code="block_config"/></h3>
-<div class="row">
+<div class="row ipInfo">
 	<div class="row">
 	    <div class="col-md-6">
 	        <div class="form-group">
@@ -9,7 +9,7 @@
 	            <div class="col-md-6">
 	            	 <select name="ipType" class="selectpicker show-tick form-control required">
 	                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-								<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode}">selected</c:if>>${ipTypeC.itemValue}</option>
+								<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>>${ipTypeC.itemValue}</option>
 	                			</c:forEach>
 	                 </select>
 	            </div>

src/main/webapp/WEB-INF/include/form/stringInfo.jsp

@@ -1,134 +1,67 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <h3 class="form-section"><spring:message code="block_config"/></h3>
-<div class="row">
+<div class="row stringInfo">
-    <div class="col-md-6">
+	<div class="row">
-        <div class="form-group">
+		<div class="col-md-6">
-            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+	        <div class="form-group ">
-            <div class="col-md-6">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
-                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+	            <div class="col-md-6">
-            </div>
+	            	 <input class="form-control required" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
-            <div for="cfgDesc"></div>
+	            </div>
-        </div>
+	            <div for="cfgKeywords"></div>
-    </div>
+	        </div>
-    <div class="col-md-6">
+	    </div>
-        <div class="form-group ">
+	    <div class="col-md-6">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
+	        <div class="form-group">
-            <div class="col-md-6">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
-            	 <input class="form-control required" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
+	            <div class="col-md-6">
-            </div>
+	            	<select name="isHexbin" class="selectpicker select2 form-control required" >
-            <div for="cfgKeywords"></div>
+						<option value=""><spring:message code="select"/></option>
-        </div>
+						<option value="0" <c:if test="${_cfg.isHexbin==0 || _cfg.isHexbin==null }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-    </div>
+						<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
+						<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
+					</select>
+	            </div>
+	            <div for="isHexbin"></div>
+	        </div>
+	    </div>
+	</div>
+	<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" name="exprType" value="1" class="required"
+	            			<c:if test="${_cfg.exprType==1}">checked</c:if>
+	            		><spring:message code="and"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="exprType" value="0" class="required"
+	            			<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
+	            		><spring:message code="null"/>
+	            	</label>
+	            </div>
+	            <div for="exprType"></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="match_method"/></label>
+	            <div class="col-md-6">
+	            	<select name="matchMethod" class="selectpicker select2 form-control required" >
+						<option value=""><spring:message code="select"/></option>
+						<option value="0" <c:if test="${_cfg.matchMethod==0 || _cfg.matchMethod==null}">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+						<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
+						<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
+						<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
+					</select>
+	            </div>
+	            <div for="matchMethod"></div>
+	        </div>
+	    </div>
+	    
+	</div>
 </div>
-<c:choose>
-	<c:when test="${action ==5}">
-		<input type="hidden" name="isAreaEffective" value="0">
-		<input type="hidden" name="exprType" value="0">
-		<input type="hidden" name="matchMethod" value="0">
-		<input type="hidden" name="isHexbin" value="0">
-	</c:when>
-	<c:otherwise>
-		<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" name="exprType" value="1" class="required"
-		            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-		            		><spring:message code="and"/>
-		            	</label>
-		            	<label class="radio-inline">
-		            		<input type="radio" name="exprType" value="0" class="required"
-		            			<c:if test="${_cfg.exprType==0}">checked</c:if>
-		            		><spring:message code="null"/>
-		            	</label>
-		            </div>
-		            <div for="exprType"></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="match_method"/></label>
-		            <div class="col-md-6">
-		            	<select name="matchMethod" class="selectpicker select2 form-control required" >
-							<option value=""><spring:message code="select"/></option>
-							<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
-							<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
-							<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
-							<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
-						</select>
-		            </div>
-		            <div for="matchMethod"></div>
-		        </div>
-		    </div>
-		</div>
-		<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="whether_hexbinary"/></label>
-		            <div class="col-md-6">
-		            	<select name="isHexbin" class="selectpicker select2 form-control required" >
-							<option value=""><spring:message code="select"/></option>
-							<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-							<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
-							<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
-						</select>
-		            </div>
-		            <div for="isHexbin"></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="whether_area_block"/></label>
-		            <div class="col-md-6">
-		            	<label class="radio-inline">
-		            		<input type="radio" name="isAreaEffective" value="1" class="required"
-		            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-		            			<c:if test="${action==2}">disabled</c:if>
-		            		><spring:message code="yes"/>
-		            	</label>
-		            	<label class="radio-inline">
-		            		<input type="radio" name="isAreaEffective" value="0" class="required"
-		            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-		            			<c:if test="${action==2}">disabled</c:if>
-		            		><spring:message code="no"/>
-		            	</label>
-		            	<c:if test="${action==2}">
-		            		<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
-						</c:if>
-		            </div>
-		            <div for="isAreaEffective"></div>
-		        </div>
-		    </div>
-		</div>
-		<div class="row">
-		    <%-- <div class="col-md-6">
-		        <div class="form-group ">
-		            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-		            <div class="col-md-6">
-		                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-		            </div>
-		            <div for="areaEffectiveIds"></div>
-		        </div>
-		    </div> --%>
-		    <div class="hidden areaType col-md-6">
-		        <div class="form-group">
-		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
-		            <div class="col-md-6">
-		            	<label class="radio-inline">
-		            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
-		            	</label>
-		            	<label class="radio-inline">
-		            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
-		            	</label>
-		            </div>
-		            <div for="areaType"></div>
-		            <input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-		        </div>
-		    </div>
-		</div>
-	</c:otherwise>
-</c:choose>
 <!--/row-->

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

@@ -83,7 +83,7 @@ $(function(){
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 															<spring:message code="${service.actionCode }" />
 														</c:if>
 													</label>
@@ -96,7 +96,6 @@ $(function(){
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
-                           <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">

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

@@ -55,9 +55,9 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		
-			<shiro:hasPermission name="avContentIp:config">
+			<shiro:hasPermission name="avContIp:config">
 				<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/ntc/av/contentIpForm?functionId=${cfg.functionId}'">
+			onClick="javascript:window.location='${ctx}/ntc/av/contIpForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>
 			</shiro:hasPermission>
@@ -72,7 +72,7 @@
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/contentIpList?functionId=${cfg.functionId}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/contIpList?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}"/>
@@ -117,11 +117,11 @@
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-							 		<shiro:hasPermission name="avContentIp:config">
+							 		<shiro:hasPermission name="avContIp:config">
-							 			<sys:delRow url="${ctx}/ntc/av/contentIpForm" id="contentTable" label="update"></sys:delRow>
+							 			<sys:delRow url="${ctx}/ntc/av/contIpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvContIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avContentIp:audit">
+                               		<shiro:hasPermission name="avContIp:audit">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

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

@@ -0,0 +1,119 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script type="text/javascript">
+$(function(){
+	$("#cancel").on("click",function(){
+		window.history.back();
+	});
+	$(".action").on("change", function() {
+		$("#serviceId").val($(this).attr("serviceId"));
+	});
+	$("#serviceId").val($(".action:checked").attr("serviceId"));
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			//loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
+});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+
+	<%-- <h3 class="page-title">
+		<spring:message code="${add}"></spring:message>
+	</h3> --%>
+	
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
+						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/ntc/av/saveContUrl" method="post" class="form-horizontal">
+                      	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                          <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="action"/></label>
+								            <div class="col-md-6">
+								            	<c:forEach items="${serviceList}" var="service"
+													varStatus="satus">
+													<label class="radio-inline"> <c:if
+															test="${_cfg.functionId eq service.functionId}">
+															<input type="radio" name="action"
+																serviceId="${service.serviceId }"
+																protocolId="${service.protocolId }"
+																value="${service.action }" class="required action"
+																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+															<spring:message code="${service.actionCode }" />
+														</c:if>
+													</label>
+												</c:forEach>
+								            </div>
+								            <div for="action"></div>
+								       </div>
+								   </div>
+								</div>
+							<!-- desc and action -->
+                           <%@include file="/WEB-INF/include/form/stringInfo.jsp" %>
+                           <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
+                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                          </div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,410 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script>
+ 	$(document).ready(function() {
+ 		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.cfgKeywords}"){
+			$("#intype").val("${cfg.cfgKeywords}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#description").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+ 	});
+ 	var edit=function(url){
+ 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
+ 		if(cked.val()==1){
+ 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 		if(cked.length==1){
+ 			window.location = url+"&compileId="+cked.attr("id");
+ 		}else{
+ 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 	}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		
+			<shiro:hasPermission name="avContUrl:config">
+				<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/ntc/av/contUrlForm?functionId=${cfg.functionId}'">
+				<i class="fa fa-plus"></i>
+				<spring:message code="add"></spring:message></button>
+			</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/contUrlList?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}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
+						callback="page();" />
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<c:set var="state"><spring:message code='state'/></c:set>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="all_states"/></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<%-- <form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option> --%>
+									</form:select>
+								</div>
+								
+								<div class="pull-left">
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         
+                                        	<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="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  
+                                    </div> 
+								</div>
+								<div class="pull-left">
+									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+							 		<shiro:hasPermission name="avContUrl:config">
+							 			<sys:delRow url="${ctx}/ntc/av/contUrlForm" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/av/updateAvContUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                               		<shiro:hasPermission name="avContUrl:audit">
+	                                    <div class="btn-group">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right">
+	                                            <li><sys:delRow url="${ctx}/ntc/av/auditAvContUrl?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvContUrl?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvContUrl?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+				                            </ul>
+				                         </div>
+                                    </shiro:hasPermission>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                 </div>
+							</div>
+							<!-- /搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-3">
+											
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/></label>
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+									
+								</div>
+								
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+								</div>
+								
+							
+							</div> 
+							
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<%-- <th><spring:message code="seq"/></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="is_audit"/></th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="type"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
+									<th><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
+									<%-- <th><spring:message code="operation"></spring:message></th> --%>
+								</tr>
+							</thead>
+							<tbody>
+								<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.cfgDesc }</td>
+									<td>${cfg.cfgKeywords }</td>
+									<td>
+										<c:if test="${cfg.isHexbin==0}"><spring:message code="case_insensitive_nohex"></spring:message></c:if>
+										<c:if test="${voipAccount.isHexbin==1 }"><spring:message code="hex_binary"></spring:message></c:if>
+										<c:if test="${voipAccount.isHexbin==2 }"><spring:message code="case_sensitive_nohex"></spring:message></c:if>
+									</td>
+									<td>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+									</td>
+									<td>
+										<c:if test="${cfg.matchMethod==0 }"><spring:message code="substring_match"></spring:message></c:if>
+										<c:if test="${cfg.matchMethod==1 }"><spring:message code="right_match"></spring:message></c:if>
+										<c:if test="${cfg.matchMethod==2 }"><spring:message code="left_match"></spring:message></c:if>
+										<c:if test="${cfg.matchMethod==3 }"><spring:message code="exactly_match"></spring:message></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemValue eq cfg.action }">
+												<spring:message code="${dict.itemCode }"/>
+											</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>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td>
+										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+									</td>
+									<td>${cfg.requestName }</td>
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fls}" var="fl">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									<td title="${classify }">
+										${fns:abbr(classify,20)}
+									</td>
+									<c:set var="attribute"></c:set>
+									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									<td title="${attribute }">
+										${fns:abbr(attribute,20)}
+									</td>
+									<c:set var="lableInfo"></c:set>
+									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									<td title="${lableInfo }">
+										${fns:abbr(lableInfo,20)}
+									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									
+									<td>${cfg.creatorName }</td>
+									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.editorName }</td>
+									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.auditorName }</td>
+									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+					
+				</div>
+			</div>
+</div>
+
+</body>
+</html>

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

@@ -83,7 +83,7 @@ $(function(){
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 															<spring:message code="${service.actionCode }" />
 														</c:if>
 													</label>
@@ -96,7 +96,6 @@ $(function(){
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
-                           <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">

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

@@ -0,0 +1,119 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script type="text/javascript">
+$(function(){
+	$("#cancel").on("click",function(){
+		window.history.back();
+	});
+	$(".action").on("change", function() {
+		$("#serviceId").val($(this).attr("serviceId"));
+	});
+	$("#serviceId").val($(".action:checked").attr("serviceId"));
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			//loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
+});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+
+	<%-- <h3 class="page-title">
+		<spring:message code="${add}"></spring:message>
+	</h3> --%>
+	
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
+						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/ntc/av/savePicUrl" method="post" class="form-horizontal">
+                      	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                          <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="action"/></label>
+								            <div class="col-md-6">
+								            	<c:forEach items="${serviceList}" var="service"
+													varStatus="satus">
+													<label class="radio-inline"> <c:if
+															test="${_cfg.functionId eq service.functionId}">
+															<input type="radio" name="action"
+																serviceId="${service.serviceId }"
+																protocolId="${service.protocolId }"
+																value="${service.action }" class="required action"
+																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+															<spring:message code="${service.actionCode }" />
+														</c:if>
+													</label>
+												</c:forEach>
+								            </div>
+								            <div for="action"></div>
+								       </div>
+								   </div>
+								</div>
+							<!-- desc and action -->
+                           <%@include file="/WEB-INF/include/form/stringInfo.jsp" %>
+                           <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
+                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                          </div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,410 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script>
+ 	$(document).ready(function() {
+ 		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.cfgKeywords}"){
+			$("#intype").val("${cfg.cfgKeywords}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#description").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+ 	});
+ 	var edit=function(url){
+ 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
+ 		if(cked.val()==1){
+ 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 		if(cked.length==1){
+ 			window.location = url+"&compileId="+cked.attr("id");
+ 		}else{
+ 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 	}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		
+			<shiro:hasPermission name="avPicUrl:config">
+				<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/ntc/av/picUrlForm?functionId=${cfg.functionId}'">
+				<i class="fa fa-plus"></i>
+				<spring:message code="add"></spring:message></button>
+			</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/picUrlList?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}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
+						callback="page();" />
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<c:set var="state"><spring:message code='state'/></c:set>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="all_states"/></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<%-- <form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option> --%>
+									</form:select>
+								</div>
+								
+								<div class="pull-left">
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         
+                                        	<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="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  
+                                    </div> 
+								</div>
+								<div class="pull-left">
+									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+							 		<shiro:hasPermission name="avPicUrl:config">
+							 			<sys:delRow url="${ctx}/ntc/av/picUrlForm" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/av/updateAvPicUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                               		<shiro:hasPermission name="avPicUrl:audit">
+	                                    <div class="btn-group">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right">
+	                                            <li><sys:delRow url="${ctx}/ntc/av/auditAvPicUrl?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvPicUrl?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvPicUrl?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+				                            </ul>
+				                         </div>
+                                    </shiro:hasPermission>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                 </div>
+							</div>
+							<!-- /搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-3">
+											
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/></label>
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+									
+								</div>
+								
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+								</div>
+								
+							
+							</div> 
+							
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<%-- <th><spring:message code="seq"/></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="is_audit"/></th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="type"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
+									<th><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
+									<%-- <th><spring:message code="operation"></spring:message></th> --%>
+								</tr>
+							</thead>
+							<tbody>
+								<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.cfgDesc }</td>
+									<td>${cfg.cfgKeywords }</td>
+									<td>
+										<c:if test="${cfg.isHexbin==0}"><spring:message code="case_insensitive_nohex"></spring:message></c:if>
+										<c:if test="${voipAccount.isHexbin==1 }"><spring:message code="hex_binary"></spring:message></c:if>
+										<c:if test="${voipAccount.isHexbin==2 }"><spring:message code="case_sensitive_nohex"></spring:message></c:if>
+									</td>
+									<td>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+									</td>
+									<td>
+										<c:if test="${cfg.matchMethod==0 }"><spring:message code="substring_match"></spring:message></c:if>
+										<c:if test="${cfg.matchMethod==1 }"><spring:message code="right_match"></spring:message></c:if>
+										<c:if test="${cfg.matchMethod==2 }"><spring:message code="left_match"></spring:message></c:if>
+										<c:if test="${cfg.matchMethod==3 }"><spring:message code="exactly_match"></spring:message></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemValue eq cfg.action }">
+												<spring:message code="${dict.itemCode }"/>
+											</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>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td>
+										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+									</td>
+									<td>${cfg.requestName }</td>
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fls}" var="fl">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									<td title="${classify }">
+										${fns:abbr(classify,20)}
+									</td>
+									<c:set var="attribute"></c:set>
+									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									<td title="${attribute }">
+										${fns:abbr(attribute,20)}
+									</td>
+									<c:set var="lableInfo"></c:set>
+									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									<td title="${lableInfo }">
+										${fns:abbr(lableInfo,20)}
+									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									
+									<td>${cfg.creatorName }</td>
+									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.editorName }</td>
+									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.auditorName }</td>
+									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+					
+				</div>
+			</div>
+</div>
+
+</body>
+</html>

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

@@ -129,7 +129,7 @@ var delContent=function(contentClassName,addBtnClassName){
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 															<spring:message code="${service.actionCode }" />
 														</c:if>
 													</label>
@@ -184,8 +184,8 @@ var delContent=function(contentClassName,addBtnClassName){
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 							            <div class="col-md-6">
 							                 <select name="voipIps[${status.index }].ipType" class="selectpicker show-tick form-control required">
-							                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
+							                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType" varStatus="satus">
-												<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode}">selected</c:if> >${ipType.itemValue}</option>
+												<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode || (voipIp.ipType==null && ipType.itemCode==4)}">selected</c:if> >${ipType.itemValue}</option>
 					                			</c:forEach>
 							                 </select>
 							            </div>
@@ -418,7 +418,6 @@ var delContent=function(contentClassName,addBtnClassName){
 							<br>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                             <br>
-                           	<!-- <input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0"> -->
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js

@@ -311,6 +311,18 @@ jQuery.validator.addMethod("portCheck",function(value, element) {
 			}
 		}
 	});
+jQuery.validator.addMethod("chooseAreaOrIsp",function(value, element) {
+	var isp="";
+	if($(element).is(":visible")){
+		isp=$(element).closest(".row").find("select[name$='.isp']").val()
+	}
+	if(value =='' && isp==""){
+		$.validator.messages.chooseAreaOrIsp=$.validator.messages.chooseAreaOrIsp
+		return false;
+	}
+	return true;
+	
+});
 //ip v4转数字
 var ipToNumber=function (ip){
 	var num =0;

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js

@@ -32,6 +32,7 @@
 		portCheck:"Please enter a correct port",
 		notStartZero:"Please enter a valid Integer",
 		portRange:"Please enter a valid Integer",
-		portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\"."
+		portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\".",
+		chooseAreaOrIsp:"The region and the oprater must choose one"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js

@@ -30,6 +30,7 @@
 		ipRange1:"start IP should smaller than end IP",
 		portCheck: " Пожалуйста, введите  правильный  порт.",
 		portRange:"Please enter a valid Integer",
-		portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\"."
+		portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\".",
+		chooseAreaOrIsp:"The region and the oprater must choose one"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

@@ -34,5 +34,6 @@
 		ipRange1:"起始IP值应小于结束IP值",
 		portRange:"端口必须为整数，非0数字不能以0开头",
 		portMaskRange:"端口必须为整数，掩码范围0-65535，非0数字不能以0开头。格式为\"端口/掩码\"",
+		chooseAreaOrIsp:"区域和运营商必选一个"
 	});
 }(jQuery));