Stream Media 域配置

NTC_STREAM_MEDIA_URL
NTC_ SUBSCRIBE_ID
NTC_UNIVERSAL_IP[protocol_id=23]
NTC_UNIVERSAL_PROTO_TYPE

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

@@ -8,11 +8,22 @@ package com.nis.domain.configuration;
  * @version V1.0
  */
 public class AvContUrlCfg extends BaseStringCfg<AvContUrlCfg> {
-
+	private static final String tableName="av_cont_url_cfg";
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1249923766365462700L;
 	
+	@Override
+	public void initDefaultValue() {
+		super.initDefaultValue();
+		this.exprType=0;
+		this.matchMethod=0;
+	}
+	
+	public static String getTablename() {
+		return tableName;
+	}
+	
 	
 }

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

@@ -56,6 +56,8 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private NtcBgpAsCfg ntcBgpAsCfg;
 	private InterceptPktBin interceptPktBin;
 	private List<InterceptPktBin> interceptPktBinList;
+	private AvContUrlCfg avContUrlCfg;
+	private List<AvContUrlCfg> avContUrlCfgList;
 	
 	private Long dnsStrategyId;
 	private String dnsStrategyName;
@@ -66,9 +68,18 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private List<P2pHashCfg> p2pHashList;
 	private List<P2pKeywordCfg> p2pKeywordList;
 	
-	
-	
-	
+	public AvContUrlCfg getAvContUrlCfg() {
+		return avContUrlCfg;
+	}
+	public void setAvContUrlCfg(AvContUrlCfg avContUrlCfg) {
+		this.avContUrlCfg = avContUrlCfg;
+	}
+	public List<AvContUrlCfg> getAvContUrlCfgList() {
+		return avContUrlCfgList;
+	}
+	public void setAvContUrlCfgList(List<AvContUrlCfg> avContUrlCfgList) {
+		this.avContUrlCfgList = avContUrlCfgList;
+	}
 	public Integer getAsnIpGroup() {
 		return asnIpGroup;
 	}

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

@@ -24,6 +24,7 @@ import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
+import com.nis.domain.configuration.AvContUrlCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
@@ -545,12 +546,18 @@ public class AvContentController extends BaseController  {
 	@RequestMapping(value = {"/contUrlList"})
 	public String contUrlList(Model model,HttpServletRequest  request
 			,HttpServletResponse response
-			,@ModelAttribute("cfg")BaseStringCfg entity
+			,@ModelAttribute("cfg")CfgIndexInfo entity
 			,RedirectAttributes redirectAttributes){
 		if(entity.getIpPort()== null){
 			entity.setIpPort(new IpPortCfg());
 		}
-		Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
+		if(entity.getAvContUrlCfgList()== null){
+			entity.setAvContUrlCfg(new AvContUrlCfg());;
+		}
+		if(entity.getNtcSubscribeIdCfg()==null){
+			entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg());
+		}
+		Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
 		model.addAttribute("page", page);
 		initPageCondition(model,entity);
 		return "/cfg/av/contUrl/contUrlList";
@@ -558,15 +565,25 @@ public class AvContentController extends BaseController  {
 	//音视频CONTUrl新增界面
 	@RequestMapping(value = {"/contUrlForm"})
 	@RequiresPermissions(value={"avContUrl:config"})
-	public String contUrlForm(Model model,HttpServletRequest request
-			,HttpServletResponse response,String ids,String compileIds
-			,@ModelAttribute("cfg")BaseStringCfg cfg
-			,RedirectAttributes redirectAttributes){
-		if(!StringUtil.isEmpty(compileIds)){
-			cfg.setCompileId(Integer.parseInt(compileIds));
-			cfg = avContentCfgService.getContUrlCfgById(cfg);
+	public String contUrlForm(Model model,HttpServletRequest request ,HttpServletResponse response
+			,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
+		if(!StringUtil.isEmpty(ids)){
+			cfg.setCfgId(Long.parseLong(ids));
+			cfg = avContentCfgService.getUrlCfgIndexInfo(cfg);
+			AvContUrlCfg urlCfg = new AvContUrlCfg();
+			urlCfg.setCfgType("NTC_STREAMING_MEDIA_URL");
+			cfg.setAvContUrlCfg(urlCfg);
+			if(cfg.getAvContUrlCfgList().size()==0){
+				cfg.getAvContUrlCfgList().add(urlCfg);
+			}
 			initUpdateFormCondition(model, cfg);
 		}else{
+			AvContUrlCfg urlCfg = new AvContUrlCfg();
+			urlCfg.setCfgType("NTC_STREAMING_MEDIA_URL");
+			cfg.setAvContUrlCfg(urlCfg);
+			List<AvContUrlCfg> urlList=new ArrayList<AvContUrlCfg>();
+			urlList.add(urlCfg);
+			cfg.setAvContUrlCfgList(urlList);
 			initFormCondition(model,cfg);
 		}
 		model.addAttribute("_cfg", cfg);
@@ -575,19 +592,22 @@ public class AvContentController extends BaseController  {
 	
 	//保存CONTUrl信息
 	@RequestMapping(value = {"/saveContUrl"})
-	public String saveContUrl(Model model,HttpServletRequest request
-			,HttpServletResponse response,
-			@ModelAttribute("cfg")BaseStringCfg cfg,
-			@ModelAttribute("areaCfgIds")String areaCfgIds
-			,RedirectAttributes redirectAttributes){
+	public String saveContUrl(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
+			CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
 		try{
-			avContentCfgService.saveOrUpdateContUrl(cfg,areaCfgIds);
+			avContentCfgService.saveOrUpdateContUrl(cfg);
 			addMessage(redirectAttributes,"save_success");
 		}catch(Exception e){
-			logger.error("信息保存失败",e);
+			if(e instanceof MaatConvertException) {
+				e.printStackTrace();
+				logger.error("Stream Media 信息保存失败",e);
+				addMessage(redirectAttributes,"request_service_failed");
+			}else {
+				e.printStackTrace();
+				logger.error("Stream Media 信息保存失败",e);
 				addMessage(redirectAttributes,"save_failed");
 			}
-		
+		}
 		return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();
 	}
 	
@@ -606,8 +626,8 @@ public class AvContentController extends BaseController  {
 	public String auditContUrl(Integer isAudit,Integer isValid,String ids
 			,String compileIds,Integer functionId
 			, RedirectAttributes redirectAttributes) {
-		if(!StringUtil.isEmpty(compileIds)){
-			String[] idArray = compileIds.split(",");
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
 				try {
@@ -625,25 +645,44 @@ public class AvContentController extends BaseController  {
 	// 获取域配置信息
 	@RequestMapping(value = {"ajaxAvContUrlList"})
 	public String ajaxAvContUrlList(Model model,Long cfgId,Integer index) {
-		BaseStringCfg baseStrCfg = new BaseStringCfg();
-		baseStrCfg.setCfgId(cfgId);
-		BaseStringCfg<NtcSubscribeIdCfg> cfg = avContentCfgService.getContUrlCfgById(baseStrCfg);
+		CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
+		cfgIndexInfo.setCfgId(cfgId);
+		CfgIndexInfo cfg = avContentCfgService.getUrlCfgIndexInfo(cfgIndexInfo);
 		List<String[]> tabList = new ArrayList();
+		if(cfg.getIpPortList()!=null){
+			String cfgType = null;
+			for(IpPortCfg ip:cfg.getIpPortList()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		if(cfg.getAvContUrlCfgList()!=null){
+			String cfgType = null;
+			for(AvContUrlCfg avContUrlCfg:cfg.getAvContUrlCfgList()){
+				if(!avContUrlCfg.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",avContUrlCfg.getCfgType()});
+					cfgType = avContUrlCfg.getCfgType();
+				}
+			}
+		}
 		
-		tabList.add(new String[]{"2",cfg.getCfgType()});
+		
+		//查询关键字
 		if(cfg.getNtcSubscribeIdCfgList()!=null){
 			String cfgType = null;
-			for(NtcSubscribeIdCfg subscribeId:cfg.getNtcSubscribeIdCfgList()){
-				if(!subscribeId.getCfgType().equals(cfgType)){
-					tabList.add(new String[]{"2",subscribeId.getCfgType()});
-					cfgType = subscribeId.getCfgType();
+			for(NtcSubscribeIdCfg ntc:cfg.getNtcSubscribeIdCfgList()){
+				if(!ntc.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",ntc.getCfgType()});
+					cfgType = ntc.getCfgType();
 				}
 			}
 		}
 		model.addAttribute("_cfg", cfg);	
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);
-		return "/cfg/av/subList";
+		return "/cfg/av/contUrl/contSubList";
 	}
 	/*****************************contUrl业务***************/
 	

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

@@ -3,7 +3,7 @@ package com.nis.web.dao.configuration;
 
 import java.util.List;
 
-
+import com.nis.domain.configuration.AvContUrlCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseCfg;
@@ -21,11 +21,16 @@ public interface AvContentCfgDao {
 	public List<AvVoipIpCfg> findVoipIpCfgList(CfgIndexInfo entity);
 	public List<AvVoipAccountCfg> findVoipAccountCfgList(CfgIndexInfo entity);
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity);
+	public List<CfgIndexInfo> findStreamList(CfgIndexInfo entity) ;
 	
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public void saveIpPortCfg(IpPortCfg entity);
 	public void deleteIpCfg(CfgIndexInfo entity);
 	
+	public List<AvContUrlCfg> getAvContUrlList(CfgIndexInfo entity);
+	public void saveAvContUrlCfg(CfgIndexInfo entity);
+	public void deleteAvContUrlCfg(CfgIndexInfo entity);
+	
 	public void insertCfgIndexInfo(CfgIndexInfo entity);
 	public void insertAvVoipIp(CfgIndexInfo entity);
 	public void insertAvVoipAccountCfg(CfgIndexInfo entity);

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

@@ -155,6 +155,39 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
+  
+  
+    <resultMap id="AvContUrlCfgMap" type="com.nis.domain.configuration.AvContUrlCfg" >
+    <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" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
+  </resultMap>
+  
    <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
@@ -237,6 +270,12 @@
 	    FROM ip_port_cfg a where compile_id=#{compileId}  and function_id=#{functionId}
   </select>
   
+   <select id="getAvContUrlList" resultMap="AvContUrlCfgMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 SELECT 
+	     <include refid="BaseStringCfg_Column" />
+	    FROM av_cont_url_cfg r where compile_id=#{compileId} and function_id=#{functionId}
+  </select>
+  
   <!-- voip IP条件查询列表信息 -->
   <select id="findVoipList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
 		SELECT 
@@ -373,6 +412,20 @@
 	    		</where>
 	    		 )
 	    	</if>
+	    	<if test="avContUrlCfg!=null">
+	    	<if test="(avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != '') ">
+	    		AND r.compile_id in (select s.compile_id from av_cont_url_cfg s
+	    		<where>
+	    			<if test="avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != ''">
+	    				and  s.cfg_keywords  like concat(concat('%',#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+		    		<if test="compileId != null">
+		    			and  s.compile_id =#{compileId,jdbcType=INTEGER}
+		    		</if>
+	    		</where>
+	    		 )
+	    	 </if>
+	    	</if>
 	    	
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
@@ -565,18 +618,71 @@
   			<if test="compileId != null">
   				and a.compile_Id=#{compileId,jdbcType=INTEGER}
 	   		</if>
-	   		<choose>
-				<when test="isValid != null">
-					and a.is_valid=#{isValid,jdbcType=INTEGER}
-				</when>
-				<otherwise>
-					and a.is_valid != -1
-				</otherwise>
-			</choose>
-	   		
-	   		
   		</where>
   </select>
+  
+   <!-- insert av_cont_url_cfg表信息 -->
+  <insert id="saveAvContUrlCfg" parameterType="com.nis.domain.configuration.AvContUrlCfg" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into av_cont_url_cfg (
+     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,
+    cfg_type,
+  	cfg_region_code,
+  	expr_type,
+  	match_method,
+  	is_hexbin,
+  	do_log
+    )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},
+    	#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR},
+    	#{avContUrlCfg.cfgType,jdbcType=VARCHAR},
+    	#{avContUrlCfg.cfgRegionCode,jdbcType=INTEGER},
+    	#{avContUrlCfg.exprType,jdbcType=INTEGER},
+    	#{avContUrlCfg.matchMethod,jdbcType=INTEGER},
+    	#{avContUrlCfg.isHexbin,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
+    )
+  </insert>
+  
   <!-- insert cfgIndexInfox -->
   <insert id="insertCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
     insert into cfg_index_info(
@@ -1261,6 +1367,10 @@
     </where>
   </delete>
   
+   <delete id="deleteAvContUrlCfg">
+  	delete from av_cont_url_cfg where compile_id=#{compileId} and function_id=#{functionId}
+  </delete>
+  
   
  <!-- 删除http子配置 -->
   <delete id="deleteIpCfg" >

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

@@ -15,11 +15,13 @@ import org.springframework.transaction.annotation.Transactional;
 import com.nis.domain.Page;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
+import com.nis.domain.configuration.AvContUrlCfg;
 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.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.maat.MaatCfg;
@@ -117,15 +119,26 @@ public class AvContentCfgService extends BaseService{
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
 		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(cfg);
-		//List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(cfg);
 		List<IpPortCfg> ipPortList = avContentCfgDao.getIpPortList(cfg);
 		List<AvVoipAccountCfg>  voipAccounts=getVoipAccountCfgList(cfg);
 		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
-		//cfg.setVoipIps(voipIps);
 		cfg.setVoipAccounts(voipAccounts);
 		cfg.setIpPortList(ipPortList);
 		return cfg;
 	}
+	
+	public CfgIndexInfo getUrlCfgIndexInfo(CfgIndexInfo entity) {
+		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
+		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(cfg);
+		List<AvContUrlCfg>  avContUrlList=avContentCfgDao.getAvContUrlList(cfg);
+		List<IpPortCfg> ipPortList = avContentCfgDao.getIpPortList(cfg);
+		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
+		cfg.setIpPortList(ipPortList);
+		cfg.setAvContUrlCfgList(avContUrlList);
+		return cfg;
+	}
+	
+	
 /*	public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
 		List<AvVoipAccountCfg>  voipAccounts=new ArrayList<>();
@@ -348,13 +361,15 @@ public class AvContentCfgService extends BaseService{
 		String[] idArray = compileIds.split(",");
 		for(String id :idArray){
 			CfgIndexInfo entity = new CfgIndexInfo();
-			entity.setCompileId(Integer.parseInt(id));
+			entity.setCfgId(Long.parseLong(id));
 			entity.setFunctionId(functionId);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(new Date());
-			//avContentCfgDao.updateAvVoipIp(entity);
+			entity.setTableName(CfgIndexInfo.getTablename());
+			avContentCfgDao.updateCfgValid(entity);
+			entity = getCfgIndexInfo(entity);
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -1344,127 +1359,106 @@ public class AvContentCfgService extends BaseService{
 		NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
 		BeanUtils.copyProperties(cfg, subscribeIdCfg, new String[] {"cfgId","isValid"});
 		List<NtcSubscribeIdCfg> list = stringCfgDao.findSubscribeIdCfgList(subscribeIdCfg);
+		CfgIndexInfo cfgInfo=new CfgIndexInfo();
+		cfgInfo.setCompileId(cfg.getCompileId());
+		List<IpPortCfg> ipPortList=avContentCfgDao.getIpPortList(cfgInfo);
 		cfg.setNtcSubscribeIdCfgList(list);
+		
 		return cfg;
 	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveOrUpdateContUrl(BaseStringCfg<BaseStringCfg> entity,String areaCfgIds){
-		Date createTime=new Date();
-		entity.setTableName("av_cont_url_cfg");
+	public void saveOrUpdateContUrl(CfgIndexInfo entity){
 		//设置区域运营商信息
 		setAreaEffectiveIds(entity);
-		//新增
+		entity.setIsValid(0);//无效
+		entity.setIsAudit(0);//未审核
 		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>();
+			Integer compileId = 0;
 			try {
-				compileIds = ConfigServiceUtil.getId(1,1);
+				List<Integer> idList = ConfigServiceUtil.getId(1, 1);
+				if(idList!=null && idList.size()>0){
+					compileId = idList.get(0);
+				}
+				entity.setCompileId(compileId);
+				entity.setCreateTime(new Date());
+				entity.setCreatorId(entity.getCurrentUser().getId());
+				avContentCfgDao.insertCfgIndexInfo(entity);
+				if(entity.getIpPortList()!=null){
+					for(IpPortCfg cfg:entity.getIpPortList()){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						avContentCfgDao.saveIpPortCfg(cfg);
+					}
+				}
+				if(entity.getNtcSubscribeIdCfgList()!=null){
+					for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+						if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+							entity.setNtcSubscribeIdCfg(cfg);
+							avContentCfgDao.insertAvVoipKeywordCfg(entity);
+						}
+					}
+				}
+				if(entity.getAvContUrlCfgList()!=null&&entity.getAvContUrlCfgList().size()>0){
+					for(AvContUrlCfg avContUrlCfg : entity.getAvContUrlCfgList()){
+						entity.setAvContUrlCfg(avContUrlCfg);
+						avContentCfgDao.saveAvContUrlCfg(entity);
+					}
+				}
+				//保存区域IP信息
+				if(entity.getAreaCfg()!=null){
+					for(AreaIpCfg cfg:entity.getAreaCfg()){
+						cfg.initDefaultValue();
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						areaIpCfgDao.saveAreaIpCfg(cfg);
+					}
+				}
 			} catch (Exception e) {
 				e.printStackTrace();
 				logger.info("获取编译ID出错");
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
 			}
 			
-			// 添加subscribeId
-			if(entity.getNtcSubscribeIdCfgList()!=null){
-				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
-					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
-						 entity.setCompileId(compileIds.get(0));
-						 BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType",
-								 										   "cfgKeywords","exprType",
-								 										   "matchMethod","isHexbin"});
-						 stringCfgDao.saveSubscribeIdCfg(cfg);
-					}
-				}
-			}
-			
-			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);
-			
+			entity.setEditTime(new Date());
+			entity.setEditorId(entity.getCurrentUser().getId());
+			avContentCfgDao.updateCfgIndexInfo(entity);
+			//无效子配置后，再新增子配置
+			avContentCfgDao.deleteIpCfg(entity);
+			stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity);
+			avContentCfgDao.deleteAvContUrlCfg(entity);
+			AreaIpCfg area = new AreaIpCfg();
+			area.setCompileId(entity.getCompileId());
+			area.setFunctionId(entity.getFunctionId());
+			areaIpCfgDao.deleteAreaIpCfg(area);
 			entity.setCreateTime(new Date());
 			entity.setCreatorId(entity.getCurrentUser().getId());
-			// 删除SubscribeId配置再进行添加
-			NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
-			BeanUtils.copyProperties(entity, subscribeIdCfg,new String[]{"cfgId","cfgType"});
-			stringCfgDao.deleteSubscribeIdCfg(subscribeIdCfg);
+			if(entity.getIpPortList()!=null){
+				for(IpPortCfg cfg:entity.getIpPortList()){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					avContentCfgDao.saveIpPortCfg(cfg);
+				}
+			}
 			if(entity.getNtcSubscribeIdCfgList()!=null){
 				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
 					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
-						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType",
-								   										  "cfgKeywords","exprType",
-								   										  "matchMethod","isHexbin"});
-						stringCfgDao.saveSubscribeIdCfg(cfg);
+						entity.setNtcSubscribeIdCfg(cfg);
+						avContentCfgDao.insertAvVoipKeywordCfg(entity);
 					}
 				}
 			}
+			if(entity.getAvContUrlCfgList()!=null&&entity.getAvContUrlCfgList().size()>0){
+				for(AvContUrlCfg avContUrlCfg : entity.getAvContUrlCfgList()){
+					entity.setAvContUrlCfg(avContUrlCfg);
+					avContentCfgDao.saveAvContUrlCfg(entity);
+				}
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null){
+				for(AreaIpCfg cfg:entity.getAreaCfg()){
+					cfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgDesc","cfgRegionCode","cfgType"});
+					areaIpCfgDao.saveAreaIpCfg(cfg);
+				}
+			}
 		}
 }
 	
@@ -1478,24 +1472,30 @@ public class AvContentCfgService extends BaseService{
 	public void updateContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			BaseStringCfg entity = new BaseStringCfg();
+			CfgIndexInfo entity = new CfgIndexInfo();
 			entity.setCfgId(Long.parseLong(id));
-			BaseStringCfg urlCfg = this.getContUrlCfgById(entity);// 获取CompileId
-			entity.setCompileId(urlCfg.getCompileId());
-			entity.setTableName("av_cont_url_cfg");
 			entity.setFunctionId(functionId);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(new Date());
-			avContentCfgDao.updateString(entity);
-			// 查询域配置信息
-			BaseStringCfg cfg = this.getContUrlCfgById(entity);
-			if(cfg.getNtcSubscribeIdCfgList() != null && cfg.getNtcSubscribeIdCfgList().size()>0) {
-				NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
-				BeanUtils.copyProperties(cfg, subscribeIdCfg, new String[] {"cfgId","cfgType","tableName"});
-				stringCfgDao.updateSubscribeIdCfg(subscribeIdCfg);
+			entity.setTableName(CfgIndexInfo.getTablename());
+			avContentCfgDao.updateCfgValid(entity);
+			entity = getUrlCfgIndexInfo(entity);
+			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+				IpPortCfg cfg = new IpPortCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(IpPortCfg.getTablename());
+				avContentCfgDao.updateCfgValid(cfg);
 			}
+			if(entity.getAvContUrlCfgList()!=null && entity.getAvContUrlCfgList().size()>0){
+				AvContUrlCfg cfg = new AvContUrlCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(AvContUrlCfg.getTablename());
+				avContentCfgDao.updateCfgValid(cfg);
+			}
+			avContentCfgDao.updateAvVoipKeywordCfgt(entity);
+			avContentCfgDao.updateCfgIndexInfo(entity);
 			AreaIpCfg areaIpCfg=new AreaIpCfg();
 			BeanUtils.copyProperties(entity, areaIpCfg);
 			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
@@ -1510,31 +1510,30 @@ public class AvContentCfgService extends BaseService{
 	 */
 	@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();
+		CfgIndexInfo entity = new CfgIndexInfo();
+		List<CfgIndexInfo> list = new ArrayList();
+		List<IpPortCfg> ipPortList =new ArrayList();
+		List <NtcSubscribeIdCfg> ntcList = new ArrayList();
 		List<AreaIpCfg> areaIpCfgList = new ArrayList();
+		List<AvContUrlCfg> avContUrlCfgList = new ArrayList();
+		CfgIndexInfo searchCfg=new CfgIndexInfo();
+		searchCfg.setCfgId(Long.parseLong(id));
 		
-		entity.setCompileId(Integer.parseInt(id));
-		entity = avContentCfgDao.findStringCfgById(entity);
-		entity.setTableName("av_cont_url_cfg");
+		entity = avContentCfgDao.getCfgIndexInfo(searchCfg);
 		entity.setIsAudit(isAudit);
 		entity.setIsValid(isValid);
 		entity.setAuditorId(UserUtils.getUser().getId());
 		entity.setAuditTime(auditTime);
-		
-		
-		avContentCfgDao.updateString(entity);
+		avContentCfgDao.updateAvVoipKeywordCfgt(entity);
+		avContentCfgDao.updateCfgIndexInfo(entity);
 		AreaIpCfg areaIpCfg=new AreaIpCfg();
-		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
-				,"cfgType"
-				,"cfgId"
-		});
+		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType","cfgId"});
 		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
 		
-		list=avContentCfgDao.getStringList(entity);
+		ipPortList = avContentCfgDao.getIpPortList(entity);
+		ntcList=stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
-		
+		avContUrlCfgList=avContentCfgDao.getAvContUrlList(entity);
 		ToMaatBean maatBean = new ToMaatBean();		
 		MaatCfg maatCfg = new MaatCfg();
 		List<MaatCfg> configCompileList = new ArrayList();
@@ -1545,11 +1544,34 @@ public class AvContentCfgService extends BaseService{
 		List<DigestCfg> digestRegionList = new ArrayList();
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
+		if(avContUrlCfgList!=null && avContUrlCfgList.size()>0){
+			entity.setAvContUrlCfgList(avContUrlCfgList);
+			AvContUrlCfg cfg = new AvContUrlCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(AvContUrlCfg.getTablename());
+			avContentCfgDao.updateCfgValid(cfg);
+		}
+		
 		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(ipPortList)){
+				Map<String,List> ipMap = cfgConvert(ipRegionList,ipPortList,1,entity,groupRelationList);
+				groupRelationList=ipMap.get("groupList");
+				ipRegionList=ipMap.get("dstList");
+				if(ipMap.get("numRegionList")!=null){
+					numRegionList.addAll(ipMap.get("numRegionList"));
+
+				}
+			}
+			if(!StringUtil.isEmpty(avContUrlCfgList)){
+				Map<String,List> urlMap = cfgConvert(strRegionList,avContUrlCfgList,2,entity,groupRelationList);
+				groupRelationList=urlMap.get("groupList");
+				strRegionList=urlMap.get("dstList");
+			}
+			
+			if(!StringUtil.isEmpty(ntcList)){
+				Map<String,List> ntcMap = cfgConvert(strRegionList,ntcList,2,entity,groupRelationList);
+				groupRelationList=ntcMap.get("groupList");
+				strRegionList=ntcMap.get("dstList");
 			}
 
 			if(!StringUtil.isEmpty(areaIpCfgList)){
@@ -1559,20 +1581,6 @@ public class AvContentCfgService extends BaseService{
 			}
 		}
 		
-		// 修改审核状态
-		BaseStringCfg baseStrCfg = this.getContUrlCfgById(entity);
-		if(!StringUtil.isEmpty(baseStrCfg.getNtcSubscribeIdCfgList())) {
-			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
-			BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId","cfgType","cfgKeywords",
-																"exprType","matchMethod","isHexbin"});
-			stringCfgDao.updateSubscribeIdCfg(cfg);
-			if(isAudit==1) {
-				Map<String,List> map = cfgConvert(strRegionList,baseStrCfg.getNtcSubscribeIdCfgList(),2,entity,groupRelationList);
-				groupRelationList=map.get("groupList");
-				strRegionList=map.get("dstList");
-			}
-		}
-		
 		//构造提交综合服务参数格式，一条配置提交一次综合服务
 		if(isAudit==1){
 			maatCfg.initDefaultValue();

src/main/resources/sql/20181012/update_stream_region.sql

@@ -0,0 +1 @@
+update function_region_dict set config_region_value ='NTC_SUBSCRIBE_ID'  where dict_id='201';

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

@@ -0,0 +1,328 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:forEach items="${_cfg.ipPortList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_type'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+										<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+										<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress}
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='port_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+										<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
+							</div>
+						</div>
+						</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='direction'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+										<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+			</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.avContUrlCfgList) >0)}">
+		<c:forEach items="${_cfg.avContUrlCfgList}" var="cfg">
+		<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='URL' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					 <div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<c:if test="${cfg.isHexbin==0 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
+		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-10">
+							<div class="form-group">
+								<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<c:if test="${cfg.isHexbin==0 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+</c:forEach>
+</html>

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

@@ -3,60 +3,99 @@
 <html>
 <head>
 <title><spring:message code="${cfgName}"></spring:message></title>
+
 <style type="text/css">
 .boxSolid {
 	border: 1px solid #eeeeee
 }
 </style>
 <script type="text/javascript">
-$(function(){
-	$("input[name='cfgKeywords']").addClass("url");
+	$(document)
+			.ready(
+					function() {
+						$(".glyphicon-plus").first().click();
+						/* $("#cancel").on("click", function() {
+							window.history.back();
+						});*/
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
+							$("#protocolId").val($(this).attr("protocolId"));
 							var action=$("input[name='action']:checked").val();
 						 	switchAction(action);
 						}); 
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
-	$("#cfgFrom").validate({
-		errorPlacement: function(error,element){
+						$("#protocolId").val($(".action:checked").attr("protocolId"));
+						$("#cfgFrom").validate(
+								{ errorPlacement : function(error, element) {
 										if($(element).parents().hasClass("tagsinput")){
 											$(element).parents(".col-md-6").next("div").append(error);
 										}else{
-				$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+											$(element).parents(".form-group").find(
+													"div[for='"
+															+ element.attr("name")
+															+ "']").append(error);
 										}
 									},
 									submitHandler : function(form) {
 										var flag = true;
-			$("input[name$='cfgKeywords']").each(function(){
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid[class~='subscribeId']").length>0){
+											if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){
+												if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
+													top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+													return;
+												}
+											}
+											if(!$(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){
+												if(($(".boxSolid").length) == ($(".boxSolid.hidden").length) + 1){
+													top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+													return;
+												}
+											}
+											//代表所有业务都隐藏了，提示必须增加一种业务数据
+										}else{
+											if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
+												top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+												return;
+											}
+										}
+										//代表所有区域都隐藏了，提示必须增加个区域信息
+										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
+											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
+											if($("#areaIp").hasClass("hidden")) $("#areaIsp").find(".glyphicon-plus").click();
+											top.$.jBox.tip("<spring:message code='one_more_area'/>", "<spring:message code='info'/>");
+											return;
+										}
+										$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
 											if($(this).val()==''){
 												$(this).parents(".form-group").find(
 														"div[for='"
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-				}/* else if(!(/^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test($(this).val()))){
-					$(this).parents(".form-group").find(
-							"div[for='"
-									+ $(this).attr("name")
-									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#urlError").text()+"</label>");
-					flag = false;
-					return;
-				} */
+											}
 										})
-			$("select[name$='isHexbin']").each(function(){
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
 												keywords=keywords.replace("***and***","")	
+											if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
-						$(this).parents(".form-body").find(
+														$(this).parents(".boxSolid").find(
 																"div[for='"
 																		+ $(this).attr("name").replace("isHexbin","cfgKeywords")
 																		+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
 														flag = false;
 													}
 												}				
+											}
 										});
+										var flag1=validateInvisibleCharTag();
+										if(flag){
+											flag=flag1;
+										}
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -68,25 +107,34 @@ $(function(){
 										}else{
 											return;
 										}
+										
 									},
 									errorContainer : "#messageBox",
-		errorPlacement : function(error, element) {
-			$(element).parents(".form-group").find(
-					"div[for='" + element.attr("name") + "']")
-					.append(error);
-		},
 								});
+						//业务内容增加
+						/* $("span[title='add']").on("click", function() {
+							$(".ipPort0").removeClass("hidden");
+						}); */
+
 					});
+
 	//业务窗口打开
 	var addContent = function(obj, contentClassName) {
 		var showDiv = $(obj).parent().parent().next();
-	$(showDiv).removeClass("hidden").removeClass("disabled");
+		$(showDiv).removeClass("hidden").removeClass(
+				"disabled");
+		/* $("."+contentClassName+"0").find("input,select").each(function(){
+			$(this).removeAttr("disabled");
+		}); */
 		$(obj).addClass("hidden");
 	}
 
 	//业务窗口关闭
 	var delContent = function(contentClassName, addBtnClassName) {
 		$("." + contentClassName).addClass("hidden").addClass("disabled");
+		/* $("."+contentClassName).find("input,select").each(function(){
+			$(this).attr("disabled","true");
+		}); */
 		$("." + addBtnClassName).removeClass("hidden");
 	}
 </script>
@@ -95,50 +143,59 @@ var delContent = function(contentClassName, addBtnClassName) {
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
-
  		<h3 class="page-title">
 			<spring:message code="${_cfg.menuNameCode }"></spring:message>
 		</h3>
-	<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="av_content_url_note"></spring:message></span>
+		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="protocol_note"></spring:message></span>
 		<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>
+							<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">
+						<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}">
+							<input type="hidden" id="serviceId" name="serviceId"
+								value="${_cfg.serviceId}">
+
 							<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>
+											<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}">
+												<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 }"
+													<label class="radio-inline"> <c:if test="${_cfg.functionId eq service.functionId}">
+														<input type="radio" name="action" serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
+																regionCode="${service.regionCode }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -153,7 +210,9 @@ var delContent = function(contentClassName, addBtnClassName) {
 											<div for="action"></div>
 										</div>
 									</div>
+									
 								</div>
+							<!-- dolog begin-->
 								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -171,27 +230,63 @@ var delContent = function(contentClassName, addBtnClassName) {
 																</label>
 															</c:otherwise>
 														</c:choose>
+													
 											</c:forEach>
 										</div>
 									</div>
 								</div>
-							<!-- desc and action -->
-							<!-- 配置域类型 -->
-	                   		<%-- <c:forEach items="${regionList}" var="region">
-	                   			<c:if test="${_cfg.functionId eq region.functionId}">
-		                           <%@include file="/WEB-INF/include/form/complexInfo.jsp" %>
-	                   			</c:if>
-	                   		</c:forEach> --%>
-	                   		<!-- SubscribeID Start -->
-                           <c:set var="subscribeIdCfgIndex" value="0"></c:set>
+								<!-- dolog end-->
+								
+								<c:set var="ipCfgIndex" value="0"></c:set>
+								<c:set var="strCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 								<c:if test="${region.configServiceType eq 'av_cont_url'}">
 	                           			<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
 										</h4>
-                           			<%@include file="/WEB-INF/include/form/complexInfo.jsp" %>
+	                           			<c:set var="tabName" value="avContUrlTab"></c:set>
+																	<%-- <c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set> --%>
+																	<c:forEach items="${_cfg.avContUrlCfgList}" var="cfg"
+																	varStatus="status">
+																		<c:set var="cfgName" value="avContUrlCfgList[${status.index}]"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index}" >
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																		</div>
+																	</c:forEach>
 									</c:if>
-										
+									<c:if test="${region.regionType eq 1 }">
+										<!--ip info-->
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus  ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
+												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
+												<c:if test="${region.configRegionValue eq ipPort.cfgType }">
+													<div class="row boxSolid ${tabName}${status.index}">
+														<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+													</div>	
+													<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>		
+												</c:if>
+												</c:forEach>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+												</div>
+												<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									<!--/ip info-->
+									</c:if>
+									<c:if test="${region.regionType eq 2 }">
+									<!-- 关键字 -->									
 									<c:if test="${region.configServiceType eq 'subscribe_id' }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
@@ -200,19 +295,18 @@ var delContent = function(contentClassName, addBtnClassName) {
 												class="glyphicon glyphicon-plus ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 														</c:when>
 													</c:choose>
 												</c:forEach>
@@ -220,37 +314,43 @@ var delContent = function(contentClassName, addBtnClassName) {
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
-													<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
-												<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 											</c:otherwise>
 										</c:choose>
 									</c:if>
+									</c:if>
 								</c:forEach>
-                           
-                           <!-- SubscribeID End -->
-	                   		
+								<br>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+								<br>
 								<%@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>
+													<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>
+
+
+							</div>
 						</form>
 						<!-- END FORM-->
 					</div>

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

@@ -3,15 +3,35 @@
 <html>
 <head>
 <title><spring:message code="${cfgName}"></spring:message></title>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script>
 	 $(document).ready(function() {
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.cfgKeywords}"){
-			$("#intype").val("${cfg.cfgKeywords}");
+		}else if("${cfg.voipIp.srcIpAddress}"){
+			$("#intype").val("${cfg.voipIp.srcIpAddress}");
+		}else if("${cfg.voipAccount.cfgKeywords}"){
+			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.voipIp.srcPort}"){
+			$("#intype").val("${cfg.voipIp.srcPort}");
+		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -31,10 +51,11 @@
 				$(this).find("option:first").attr("selected",true);
 			});
 			$(".Wdate").attr("value",'');
-			$("#description").attr("value",'');
+			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
+		
 		//异步获取voip相关信息
 		$("span[id^=open]").click(function(){
 			var openId=$(this).attr("id");
@@ -66,7 +87,7 @@
 						subTab+="</td>";
 						subTab+="</tr>";
 						$("#"+openId).parent().parent().after(subTab);
-						$("div[name='tabTitle"+index+"']").get(0).click();
+						$("div[name='tabTitle"+index+"']").eq(0).click();
 					}
 				});
 			}
@@ -81,27 +102,14 @@
 			$("#"+closeId).parent().parent().next("tr").hide();
 		}); 
 	}); 
- 	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">
+		<shiro:hasPermission name="avVoip: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>
@@ -135,7 +143,6 @@
 										<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>
 								
@@ -146,9 +153,12 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
+												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
+												<form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+												<form:option value="voipAccount.cfgKeywords"><spring:message code="av_voip_account_control"/></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
+												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
@@ -177,11 +187,12 @@
 	                                 <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">
+							 		<shiro:hasPermission name="avVoip: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:confirm">
+                                    <%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
+                               		<shiro:hasPermission name="avVoip:confirm">
 	                                    <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>
@@ -334,22 +345,17 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
-									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
-									<th><spring:message code="URL"/></th>
-									<th><spring:message code="is_hex"/></th>
-								    <th><spring:message code="is_case_insenstive"/></th>
-									<th><spring:message code="expression_type"/></th>
-									<th><spring:message code="match_method"/></th>
+								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></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>
@@ -359,76 +365,40 @@
 								</tr>
 							</thead>
 							<tbody>
-								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
+								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
 								<tr>
 									<td>
-										<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
-										<input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}">
-									</td>
-									<td>${cfg.compileId }</td>
-									<td>${cfg.cfgDesc }</td>
-									<td>
-										<a href="javascript:;" data-original-title="${fn:replace(cfg.cfgKeywords, '***and***', ' ')}"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)}
-										</a>
-									</td>
-									<c:if test="${cfg.isHexbin==0 }">
-										<td><spring:message code="not_hex"/></td>
-										<td><spring:message code="case_insenstive"/></td>
-									</c:if>
-									<c:if test="${cfg.isHexbin==1 }">
-										<td><spring:message code="hex"/></td>
-										<td><spring:message code="case_insenstive"/></td>
-									</c:if>
-									<c:if test="${cfg.isHexbin==2 }">
-										<td><spring:message code="not_hex"/></td>
-										<td><spring:message code="case_senstive"/></td>
-									</c:if>
-									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
+									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+									<input type="checkbox" class="i-checks child-checks" compileId="${indexCfg.compileId}" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
+								    <td>${indexCfg.compileId }</td>
+								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog }">
+											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
 									</td>
 									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<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 audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
-									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">
-												<a href="javascript:viewAreaInfo('${ctx}','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>
-									<td>${cfg.requestName }</td>
+									<td>${indexCfg.requestName }</td>
 									<td >
 										<c:set var="classify"></c:set>
-										<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fn:split(indexCfg.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}">
@@ -447,7 +417,7 @@
 									</td>
 									<td>
 										<c:set var="attribute"></c:set>
-										<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
+										<c:forEach items="${fn:split(indexCfg.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}">
@@ -466,7 +436,7 @@
 									</td>
 									<td>
 										<c:set var="lableInfo"></c:set>
-										<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
+										<c:forEach items="${fn:split(indexCfg.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}">
@@ -484,25 +454,32 @@
 										</a>
 									</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>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.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>
-								
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+								    <td>${indexCfg.creatorName }</td>
+									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.editorName }</td>
+									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.auditorName }</td>
+									<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 								</tr>
 								</c:forEach>
 							</tbody>
 						</table>
 						<div class="page" >${page}</div>
 					</div>
-					</div>
+					
 				</div>
 			</div>
 </div>