Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties

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

@@ -8,12 +8,14 @@ package com.nis.domain.configuration;
  * @version V1.0
  */
 public class AvVoipIpCfg extends BaseIpCfg {
-	
+	private static final String tableName="av_voip_ip_cfg";
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -942354218504312548L;
 	
-	
+	public static String getTablename() {
+		return tableName;
+	}
 	
 }

src/main/java/com/nis/util/Constants.java

@@ -390,6 +390,7 @@ public final class Constants {
 	public static final String NTC_NTC_ENTRANCE_REPORT=Configurations.getStringProperty("ntcEntranceReport","ntcEntranceReport");
 	public static final String NTC_IP_LOG = Configurations.getStringProperty("ntcIpLog","");
 	public static final String NTC_BGP_LOG = Configurations.getStringProperty("ntcBgpLog","");
+	public static final String NTC_P2P_LOG = Configurations.getStringProperty("ntcP2pLog","");
 	public static final String NTC_HTTP_LOG = Configurations.getStringProperty("ntcHttpLog","");
 	public static final String NTC_DNS_LOG = Configurations.getStringProperty("ntcDnsLog","");
 	public static final String NTC_SSL_LOG = Configurations.getStringProperty("ntcSslLog","");

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

@@ -30,6 +30,7 @@ import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.AvContIpCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
@@ -51,53 +52,67 @@ import com.nis.web.security.UserUtils;
 @RequestMapping("${adminPath}/ntc/av")
 public class AvContentController extends BaseController  {
 	/*****************************voip业务***************/
-	//音视频VOIP配置新增界面
+	//音视频VOIP IP配置新增界面
 		@RequestMapping(value = {"/voipForm"})
 		@RequiresPermissions(value={"avVoip:config"})
-		public String voipFrom(Model model,HttpServletRequest request
+		public String voipFrom(Model model,HttpServletRequest request ,HttpServletResponse response
-				,HttpServletResponse response
+				,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
-				,String ids,String compileIds
-				,@ModelAttribute("cfg")CfgIndexInfo cfg
-				,RedirectAttributes redirectAttributes){
 			if(!StringUtil.isEmpty(compileIds)){
 				cfg.setCompileId(Integer.parseInt(compileIds));
 				cfg = avContentCfgService.getCfgIndexInfo(cfg);
 				initUpdateFormCondition(model, cfg);
 			}else{
-				List<AvVoipAccountCfg> avVoipAccountCfgs=new ArrayList<AvVoipAccountCfg>();
-				avVoipAccountCfgs.add(new AvVoipAccountCfg());
-				cfg.setVoipAccounts(avVoipAccountCfgs);
-				List<AvVoipIpCfg> avVoipIpCfgs=new ArrayList<AvVoipIpCfg>();
-				avVoipIpCfgs.add(new AvVoipIpCfg());
-				cfg.setVoipIps(avVoipIpCfgs);
 				initFormCondition(model,cfg);
 			}
 			
 			model.addAttribute("_cfg", cfg);
 			return "/cfg/av/voip/voipForm";
 		}
+		//音视频VOIP Account配置新增界面
+		@RequestMapping(value = {"/voipAccountForm"})
+		@RequiresPermissions(value={"avVoip:config"})
+		public String voipAccountForm(Model model,HttpServletRequest request ,HttpServletResponse response
+				,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
+			//修改
+			if(!StringUtil.isEmpty(compileIds)){
+				cfg.setCompileId(Integer.parseInt(compileIds));
+				cfg = avContentCfgService.getCfgIndexInfo2(cfg);
+				initUpdateFormCondition(model, cfg);
+			}else{
+				initFormCondition(model,cfg);//新增
+			}
 			
+			model.addAttribute("_cfg", cfg);
+			return "/cfg/av/voip/voipAccountForm";
+		}
 	
-	//保存voip信息
+	//保存voip ip信息
 	@RequestMapping(value = {"/saveVoip"})
-	public String saveVoip(Model model,HttpServletRequest request,HttpServletResponse response,
+	public String saveVoip(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
-			@ModelAttribute("cfg")CfgIndexInfo cfg,
+			CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
-			@ModelAttribute("areaCfgIds")String areaCfgIds,
-			@ModelAttribute("voipIpIds")String voipIpIds,
-			@ModelAttribute("voipAccountIds")String voipAccountIds
-			,RedirectAttributes redirectAttributes){
 		try{
-			avContentCfgService.saveOrUpdateAvVoip(cfg,voipIpIds,voipAccountIds,areaCfgIds);
+			avContentCfgService.saveOrUpdateAvVoip(cfg);
 			addMessage(redirectAttributes,"save_success");
 		}catch(Exception e){
-			logger.error("voip信息保存失败",e);
+			logger.error("voip IP信息保存失败",e);
 			addMessage(redirectAttributes,"save_failed");
 		}
-		
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId();
 	}
-	
+	//保存voip Account信息
-	//视频文本VOIP配置列表
+	@RequestMapping(value = {"/saveAccountVoip"})
+	public String saveAccountVoip(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
+			CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
+		try{
+			avContentCfgService.saveOrUpdateAvVoipAccount(cfg);
+			addMessage(redirectAttributes,"save_success");
+		}catch(Exception e){
+			logger.error("voip Account信息保存失败",e);
+			addMessage(redirectAttributes,"save_failed");
+		}
+		return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+cfg.getFunctionId();
+	}
+	//视频文本VOIP IP配置列表
 	@RequestMapping(value = {"/voipList"})
 	public String voipCfgList(Model model,HttpServletRequest  request
 			,HttpServletResponse response
@@ -109,23 +124,50 @@ public class AvContentController extends BaseController  {
 		if(entity.getVoipAccount()== null){
 			entity.setVoipAccount(new AvVoipAccountCfg());
 		}
+		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);
 		return "/cfg/av/voip/voipList";
 	}
+	//视频文本VOIP Account配置列表
+	@RequestMapping(value = {"/voipAccountList"})
+	public String voipCfgAccountList(Model model,HttpServletRequest request ,HttpServletResponse response
+			,@ModelAttribute("cfg")CfgIndexInfo entity ,RedirectAttributes redirectAttributes){
+		if(entity.getVoipAccount()== null){
+			entity.setVoipAccount(new AvVoipAccountCfg());
+		}
+		if(entity.getNtcSubscribeIdCfg()==null){
+			entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg());
+		}
+		Page<CfgIndexInfo> page = avContentCfgService.findAccountPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model);
+		return "/cfg/av/voip/voipAccountList";
+	}
 	
 	
-	//修改VOIP配置状态
+	//修改VOIP IP配置状态
 	@RequestMapping(value = {"/updateAvVoipValid"})
 	@RequiresPermissions(value={"avVoip:config"})
-	public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId
+	public String updateVoipValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId
 			,RedirectAttributes redirectAttributes
 			) {
-		avContentCfgService.updateAvVoipValid(isAudit,isValid,ids,functionId);
+		avContentCfgService.updateAvVoipValid(isAudit,isValid,compileIds,functionId);
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
 	}
-	//修改VOIP配置审核状态
+	//修改VOIP account配置状态
+	@RequestMapping(value = {"/updateAvVoipAccountValid"})
+	@RequiresPermissions(value={"avVoip:config"})
+	public String updateVoipAccountValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId
+			,RedirectAttributes redirectAttributes
+			) {
+		avContentCfgService.updateAvVoipAccountValid(isAudit,isValid,compileIds,functionId);
+		return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+functionId;
+	}
+	//修改VOIP IP配置审核状态
 	@RequestMapping(value = {"/auditAvVoip"})
 	@RequiresPermissions(value={"avVoip:confirm"})
 	public String auditVoip(Integer isAudit,Integer isValid,String ids
@@ -146,22 +188,64 @@ public class AvContentController extends BaseController  {
 		}
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
 	}
+	//修改VOIP IP配置审核状态
+	@RequestMapping(value = {"/auditAvVoipAccount"})
+	@RequiresPermissions(value={"avVoip:confirm"})
+	public String auditVoipAccount(Integer isAudit,Integer isValid,String ids
+			,String compileIds,Integer functionId
+			,RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(compileIds)){
+			String[] idArray = compileIds.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				try {
+					avContentCfgService.auditAvVoipAccount(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					logger.error("VOIP Account配置下发失败",e);
+					addMessage(redirectAttributes, e.getMessage());
+				}
+			}
 			
+		}
+		return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+functionId;
+	}
+	
+	/**
+	 * 账号account
+	 * 根据索引表信息异步获取子表信息
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "ajaxVoipAccountInfo")
+	public Map getVoipAccountInfo(CfgIndexInfo cfgIndexInfo) {
+		Map<String, Object> voipAndAccountInfoMap=new HashMap<String, Object>();
+		List<AvVoipAccountCfg> voipAccountCfgList=new ArrayList<AvVoipAccountCfg>();
+		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList=new ArrayList<NtcSubscribeIdCfg>();
+		
+		voipAccountCfgList = avContentCfgService.getVoipAccountCfgList(cfgIndexInfo);
+		ntcSubscribeIdCfgList=avContentCfgService.getSubscribeIdCfgList(cfgIndexInfo);
+		
+		voipAndAccountInfoMap.put("account", voipAccountCfgList);
+		voipAndAccountInfoMap.put("subscribe", ntcSubscribeIdCfgList);
+		return voipAndAccountInfoMap;
+	}
 	/**
 	 * 根据索引表信息异步获取子表信息
 	 * @return
 	 */
 	@ResponseBody
-	@RequestMapping(value = "ajaxVoipAndAccountInfo")
+	@RequestMapping(value = "ajaxVoipIpInfo")
-	public Map getVoipAndAccountInfo(CfgIndexInfo cfgIndexInfo) {
+	public Map getVoipIpInfo(CfgIndexInfo cfgIndexInfo) {
 		Map<String, Object> voipAndAccountInfoMap=new HashMap<String, Object>();
 		//获取voipIpCfg信息
 		List<AvVoipIpCfg> voipIpCfgList=new ArrayList<AvVoipIpCfg>();
-		List<AvVoipAccountCfg> voipAccountCfgList=new ArrayList<AvVoipAccountCfg>();
+		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList=new ArrayList<NtcSubscribeIdCfg>();
+		
 		voipIpCfgList = avContentCfgService.getVoipIpCfgList(cfgIndexInfo);
-		voipAccountCfgList = avContentCfgService.getVoipAccountCfgList(cfgIndexInfo);
+		ntcSubscribeIdCfgList=avContentCfgService.getSubscribeIdCfgList(cfgIndexInfo);
+		
 		voipAndAccountInfoMap.put("ip", voipIpCfgList);
-		voipAndAccountInfoMap.put("account", voipAccountCfgList);
+		voipAndAccountInfoMap.put("subscribe", ntcSubscribeIdCfgList);
 		return voipAndAccountInfoMap;
 	}
 	/*****************************voip业务***************/

src/main/java/com/nis/web/controller/log/ntc/B2pLogController.java

@@ -0,0 +1,75 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.util.FileUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.NtcIpLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.Constants;
+import com.nis.util.DictUtils;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/log/ntc/p2pLogs")
+public class B2pLogController extends BaseController {
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
+		try {
+			PageLog<NtcIpLog> page = new PageLog<NtcIpLog>(request, response);
+			Map<String, Object> params = new HashMap<String, Object>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			initLogSearchValue(log, params);
+
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
+			String url = Constants.LOG_BASE_URL + Constants.NTC_P2P_LOG;
+			String recv = HttpClientUtil.getMsg(url, params, request);			
+			logger.info("查询结果:" + recv);
+			if (StringUtils.isNotBlank(recv)) {
+				Gson gson = new GsonBuilder().create();
+				LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
+				if (fromJson.getStatus().intValue() == 200) {
+					page.setList(fromJson.getData().getList());
+					List<NtcIpLog> list = page.getList();
+					for (NtcIpLog l : list) {
+						l.setFunctionId(log.getFunctionId());
+						setLogAction(l,serviceList);
+					}
+					model.addAttribute("page", page);
+				}
+			}
+		} catch (Exception e) {
+			logger.error("查询失败", e);
+			addMessageLog(model, e.getMessage());
+		}
+		
+		return "/log/ntc/p2pList";
+	}
+	
+}

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

@@ -9,23 +9,32 @@ 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.NtcSubscribeIdCfg;
 import com.nis.web.dao.MyBatisDao;
 
 
 @MyBatisDao
 public interface AvContentCfgDao {
 	public List<CfgIndexInfo> findVoipList(CfgIndexInfo entity) ;
+	public List<CfgIndexInfo> findAccountList(CfgIndexInfo entity) ;
 	public List<AvVoipIpCfg> findVoipIpCfgList(CfgIndexInfo entity);
 	public List<AvVoipAccountCfg> findVoipAccountCfgList(CfgIndexInfo entity);
+	public List<NtcSubscribeIdCfg> findSubscribeIdCfgList(CfgIndexInfo entity);
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity);
+	
 	public void insertCfgIndexInfo(CfgIndexInfo entity);
 	public void insertAvVoipIp(CfgIndexInfo entity);
-	public void insertAvVoipAccount(CfgIndexInfo entity);
+	public void insertAvVoipAccountCfg(CfgIndexInfo entity);
+	public void insertAvVoipKeywordCfg(CfgIndexInfo entity);
+	
 	public void updateCfgIndexInfo(CfgIndexInfo entity);
 	public void updateAvVoipIp(CfgIndexInfo entity);
 	public void updateAvVoipAccount(CfgIndexInfo entity);
+	public void updateAvVoipKeywordCfgt(CfgIndexInfo entity);
+	
 	public void deleteAvVoipIp(CfgIndexInfo entity);
-	public void deleteAvVoipAccount(CfgIndexInfo entity);
+	public void deleteAvVoipKeywordCfg(CfgIndexInfo entity);
+	public void deleteAvVoipAccountCfg(CfgIndexInfo entity);
 	
 	public BaseIpCfg findIpCfgById(BaseIpCfg entity) ;
 	public void insertIp(BaseIpCfg entity);
@@ -38,4 +47,5 @@ public interface AvContentCfgDao {
 	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

@@ -187,7 +187,7 @@
   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条件查询列表信息 -->
+  <!-- voip IP条件查询列表信息 -->
   <select id="findVoipList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
 		SELECT 
 	    <include refid="AvVoip_Column" />
@@ -289,6 +289,121 @@
 	    		</where>
 	    		 )
 	    	</if>
+	    	<if test="(ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != '') ">
+	    		AND r.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
+	    		<where>
+	    			<if test="ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+		    		<if test="compileId != null">
+		    			and  f.compile_id =#{compileId,jdbcType=INTEGER}
+		    		</if>
+	    		</where>
+	    		 )
+	    	</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>
+  <!-- voip Account条件查询列表信息 -->
+  <select id="findAccountList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+		SELECT 
+	    <include refid="AvVoip_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 cfg_index_info 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="search_create_time_start != null and search_create_time_start != ''">
+	    		<![CDATA[AND r.CREATE_TIME >= #{search_create_time_start,jdbcType=TIMESTAMP}]]>
+	    	</if>
+	    	<if test="search_create_time_end != null and search_create_time_end != ''">
+	    		<![CDATA[AND r.CREATE_TIME <= #{search_create_time_end,jdbcType=TIMESTAMP}]]>
+	    	</if> -->
+	    	<if test="editorName != null and editorName != ''">
+	    		AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<!-- <if test="search_edit_time_start != null and search_edit_time_start != ''">
+	    		<![CDATA[AND r.EDIT_TIME >= #{search_edit_time_start,jdbcType=TIMESTAMP}]]>
+	    	</if>
+	    	<if test="search_edit_time_end != null and search_edit_time_end != ''">
+	    		<![CDATA[AND r.EDIT_TIME <= #{search_edit_time_end,jdbcType=TIMESTAMP}]]>
+	    	</if> -->
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<!-- <if test="search_audit_time_start != null and search_audit_time_start != ''">
+	    		<![CDATA[AND r.AUDIT_TIME >= #{search_audit_time_start,jdbcType=TIMESTAMP}]]>
+	    	</if>
+	    	<if test="search_audit_time_end != null and search_audit_time_end != ''">
+	    		<![CDATA[AND r.AUDIT_TIME <= #{search_audit_time_end,jdbcType=TIMESTAMP}]]>
+	    	</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="(voipAccount.cfgKeywords != null and voipAccount.cfgKeywords != '') ">
 	    		AND r.compile_id in (select f.compile_id from av_voip_account_cfg f
 	    		<where>
@@ -301,6 +416,18 @@
 	    		</where>
 	    		 )
 	    	</if>
+	    	<if test="(ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != '') ">
+	    		AND r.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
+	    		<where>
+	    			<if test="ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+		    		<if test="compileId != null">
+		    			and  f.compile_id =#{compileId,jdbcType=INTEGER}
+		    		</if>
+	    		</where>
+	    		 )
+	    	</if>
 	    	
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
@@ -352,6 +479,26 @@
 			</choose>
   		</where>
 		
+  </select>
+   <!-- 根据compileId获取avVoipAccountCfg信息 -->
+  <select id="findSubscribeIdCfgList" resultMap="BaseStringCfgMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		select 
+			<include refid="BaseStringCfg_Column" />
+		from ntc_subscribe_id_cfg r
+		<where>
+  			<if test="compileId != null">
+  				and r.COMPILE_ID=#{compileId,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>
   <!-- 根据Id获取cfgIndexInfo信息 -->
   <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
@@ -490,7 +637,7 @@
     )
   </insert>
   <!-- insert AV_VOIP_ACCOUNT_CFG表信息 -->
-  <insert id="insertAvVoipAccount" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+  <insert id="insertAvVoipAccountCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
     insert into av_voip_account_cfg (
      CFG_DESC,
      ACTION,
@@ -545,6 +692,62 @@
     	#{voipAccount.isHexbin,jdbcType=INTEGER}
     )
   </insert>
+  <!-- insert AV_VOIP_ACCOUNT_CFG表信息 -->
+  <insert id="insertAvVoipKeywordCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+    insert into ntc_subscribe_id_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
+    )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},
+    	#{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR},
+    	#{ntcSubscribeIdCfg.cfgType,jdbcType=VARCHAR},
+    	#{ntcSubscribeIdCfg.cfgRegionCode,jdbcType=INTEGER},
+    	#{ntcSubscribeIdCfg.exprType,jdbcType=INTEGER},
+    	#{ntcSubscribeIdCfg.matchMethod,jdbcType=INTEGER},
+    	#{ntcSubscribeIdCfg.isHexbin,jdbcType=INTEGER}
+    )
+  </insert>
   <!-- update cfg_index_info表信息 -->
   <update id="updateCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
     update cfg_index_info
@@ -721,6 +924,94 @@
       	</if>
     </where>
   </update>
+  <!-- update ntc_subscribe_id_cfg表信息 -->
+  <update id="updateAvVoipKeywordCfgt" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+    update ntc_subscribe_id_cfg
+    <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="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != ''" >
+        cfg_keywords = #{ntcSubscribeIdCfg.cfgKeywords,jdbcType=VARCHAR},
+      </if>
+       <if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.cfgType != null and ntcSubscribeIdCfg.cfgType != ''" >
+        cfg_type = #{ntcSubscribeIdCfg.cfgType,jdbcType=VARCHAR},
+      </if>
+       <if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.cfgRegionCode != null " >
+        cfg_region_code = #{ntcSubscribeIdCfg.cfgRegionCode,jdbcType=INTEGER},
+      </if>
+       <if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.exprType != null " >
+        expr_type = #{ntcSubscribeIdCfg.exprType,jdbcType=INTEGER},
+      </if>
+       <if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.matchMethod != null " >
+        match_method = #{ntcSubscribeIdCfg.matchMethod,jdbcType=INTEGER},
+      </if>
+       <if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.isHexbin != null " >
+        is_hexbin = #{ntcSubscribeIdCfg.isHexbin,jdbcType=INTEGER},
+      </if>
+      </trim>
+    </set>
+    <where>
+    	<if test="voipAccount != null and voipAccount.cfgId != null" >
+        	and cfg_id =  #{ntcSubscribeIdCfg.cfgId,jdbcType=INTEGER}
+      	</if>
+    	<if test="compileId != null" >
+        	and compile_id =  #{compileId,jdbcType=INTEGER}
+      	</if>
+    	<if test="functionId != null" >
+        	and function_id =  #{functionId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
   <!-- update av_voip_account_cfg表信息 -->
   <update id="updateAvVoipAccount" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
     update av_voip_account_cfg
@@ -824,8 +1115,23 @@
       	</if>
     </where>
   </delete>
+  <!-- 删除voip subscribe信息 -->
+  <delete id="deleteAvVoipKeywordCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+    delete from ntc_subscribe_id_cfg
+    <where>
+    	<if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.cfgId != null" >
+        	and cfg_id =  #{ntcSubscribeIdCfg.cfgId,jdbcType=INTEGER}
+      	</if>
+    	<if test="compileId != null" >
+        	and compile_id =  #{compileId,jdbcType=INTEGER}
+      	</if>
+    	<if test="functionId != null" >
+        	and function_id =  #{functionId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </delete>
   <!-- 删除voipIp信息 -->
-  <delete id="deleteAvVoipAccount" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+  <delete id="deleteAvVoipAccountCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
     delete from av_voip_account_cfg
     <where>
     	<if test="voipAccount != null and voipAccount.cfgId != null" >

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

@@ -20,6 +20,8 @@ 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.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
@@ -35,6 +37,7 @@ import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.AvContentCfgDao;
+import com.nis.web.dao.configuration.StringCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -51,6 +54,8 @@ public class AvContentCfgService extends BaseService{
 	protected AvContentCfgDao avContentCfgDao;
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
+	@Autowired
+	protected StringCfgDao stringCfgDao;
 	
 	
 	/********************************voip业务*********************************/
@@ -67,6 +72,19 @@ public class AvContentCfgService extends BaseService{
 		page.setList(list);
 		return page;
 	}
+	/**
+	 * 查询account分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<CfgIndexInfo> findAccountPage(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		List<CfgIndexInfo> list=avContentCfgDao.findAccountList(entity);
+		page.setList(list);
+		return page;
+	}
 	/**
 	 * 根据索引表信息获取voipIpCfg信息
 	 * @param entity
@@ -83,199 +101,242 @@ public class AvContentCfgService extends BaseService{
 	public List<AvVoipAccountCfg> getVoipAccountCfgList(CfgIndexInfo entity) {
 		return avContentCfgDao.findVoipAccountCfgList(entity);
 	}
+	/**
+	 * 公共订阅关键字SubscribeId
+	 * @param cfgIndexInfo
+	 * @return
+	 */
+	public List<NtcSubscribeIdCfg> getSubscribeIdCfgList(CfgIndexInfo entity) {
+		return avContentCfgDao.findSubscribeIdCfgList(entity);
+	}
 	/**
 	 * 根据索引表信息获取voipAccountCfg信息
 	 * @param entity
 	 * @return
 	 */
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity) {
+		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
+		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(entity);
+		if(ntcSubscribeList ==null || ntcSubscribeList.size() <=0){
+			ntcSubscribeList.add(new NtcSubscribeIdCfg());
+		}
+		List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(entity);
+		if(voipIps ==null || voipIps.size() <=0){
+			voipIps.add(new AvVoipIpCfg());
+		}
+		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
+		cfg.setVoipIps(voipIps);
+		
+		return cfg;
+	}
+	public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
 		List<AvVoipAccountCfg>  voipAccounts=new ArrayList<>();
 		voipAccounts=getVoipAccountCfgList(entity);
 		if(voipAccounts ==null || voipAccounts.size() <=0){
 			voipAccounts.add(new AvVoipAccountCfg());
 		}
-		List<AvVoipIpCfg>  voipIps=new ArrayList<>();
+		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(entity);
-		voipIps=getVoipIpCfgList(entity);
+		if(ntcSubscribeList ==null || ntcSubscribeList.size() <=0){
-		if(voipIps ==null || voipIps.size() <=0){
+			ntcSubscribeList.add(new NtcSubscribeIdCfg());
-			voipIps.add(new AvVoipIpCfg());
 		}
 		
 		cfg.setVoipAccounts(voipAccounts);
-		cfg.setVoipIps(voipIps);
+		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
 		
 		return cfg;
 	}
 	
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveOrUpdateAvVoip(CfgIndexInfo entity,String voipIpIds,String voipAccountIds,String areaCfgIds){
+	public void saveOrUpdateAvVoip(CfgIndexInfo entity){
-		Date createTime=new Date();
 		//设置区域运营商信息
 				setAreaEffectiveIds(entity);
-		//新增
+				entity.setIsValid(0);//无效
+				entity.setIsAudit(0);//未审核
 				if(entity.getCfgId()==null){
-			entity.setCreatorId(UserUtils.getUser().getId());
+					Integer compileId = 0;
-			entity.setCreateTime(createTime);
-			entity.setIsValid(0);
-			entity.setIsAudit(0);
-			//调用服务接口获取compileId
-			List<Integer> compileIds = new ArrayList<Integer>();
 					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.getVoipIps()!=null){
+							for (AvVoipIpCfg voipIp : entity.getVoipIps()) {
+								entity.setVoipIp(voipIp);
+								avContentCfgDao.insertAvVoipIp(entity);
+							}
+						}
+						if(entity.getNtcSubscribeIdCfgList()!=null){
+							for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+								if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+									entity.setNtcSubscribeIdCfg(cfg);
+									avContentCfgDao.insertAvVoipKeywordCfg(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());
 					}
-			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+					
-				entity.setCompileId(compileIds.get(0));
+				}else{
-				//保存avVoipIp
+					entity.setEditTime(new Date());
-				if(entity.getVoipIps() != null && entity.getVoipIps().size() > 0){
+					entity.setEditorId(entity.getCurrentUser().getId());
+					avContentCfgDao.updateCfgIndexInfo(entity);
+					//无效子配置后，再新增子配置
+					avContentCfgDao.deleteAvVoipIp(entity);
+					avContentCfgDao.deleteAvVoipKeywordCfg(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());
+					if(entity.getVoipIps()!=null&&entity.getVoipIps().size()>0){
 						for (AvVoipIpCfg voipIp : entity.getVoipIps()) {
 							entity.setVoipIp(voipIp);
 							avContentCfgDao.insertAvVoipIp(entity);
 						}
 					}
-				//保存avVoipAccount
+					if(entity.getNtcSubscribeIdCfgList()!=null){
-				if(entity.getVoipAccounts() != null && entity.getVoipAccounts().size() > 0){
+						for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
-					for (AvVoipAccountCfg voipAccount : entity.getVoipAccounts()) {
+							if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
-						entity.setVoipAccount(voipAccount);
+								entity.setNtcSubscribeIdCfg(cfg);
-						avContentCfgDao.insertAvVoipAccount(entity);
+								avContentCfgDao.insertAvVoipKeywordCfg(entity);
+							}
 						}
 					}
 					//保存区域IP信息
-				if(entity.getAreaCfg()!=null&&entity.getAreaCfg().size()>0){
+					if(entity.getAreaCfg()!=null){
-					for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+						for(AreaIpCfg cfg:entity.getAreaCfg()){
-						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType"});
+							cfg.initDefaultValue();
-						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+							BeanUtils.copyProperties(entity, cfg,new String[]{"cfgDesc","cfgRegionCode","cfgType"});
+							areaIpCfgDao.saveAreaIpCfg(cfg);
 						}
 					}
-				//保存cfgIndexInfo
+				}
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdateAvVoipAccount(CfgIndexInfo entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
+		entity.setIsValid(0);//无效
+		entity.setIsAudit(0);//未审核
+		if(entity.getCfgId()==null){
+			Integer compileId = 0;
+			try {
+				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);
-			}else{
+				if(entity.getVoipAccounts()!=null&&entity.getVoipAccounts().size()>0){
-				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+					for(AvVoipAccountCfg voipAccount : entity.getVoipAccounts()){
-			}
-		//修改
-		}else{
-			Date editTime=new Date();
-			entity.setIsValid(0);
-			entity.setIsAudit(0);
-			
-			voipIpIds=!StringUtil.isEmpty(voipIpIds)? voipIpIds+",":"";
-			voipAccountIds=!StringUtil.isEmpty(voipAccountIds)? voipAccountIds+",":"";
-			areaCfgIds=!StringUtil.isEmpty(areaCfgIds)? ","+areaCfgIds:"";
-			
-			//判断voip信息为新增还是修改，清楚voipIpIds修改的voipId记录，剩下即为需要删除的voipId
-			if(!StringUtil.isEmpty(entity.getVoipIps())){
-				for (AvVoipIpCfg voipIp : entity.getVoipIps()) {
-					if(!StringUtil.isEmpty(voipIp.getCfgId())){
-						if(voipIpIds.contains(","+voipIp.getCfgId()+",")){
-							voipIpIds=voipIpIds.replace(voipIp.getCfgId()+",", "");
-						}
-						//修改
-						entity.setEditorId(UserUtils.getUser().getId());
-						entity.setEditTime(editTime);
-						entity.setVoipIp(voipIp);
-						avContentCfgDao.updateAvVoipIp(entity);
-					}else{
-						//新增
-						entity.setCreatorId(UserUtils.getUser().getId());
-						entity.setCreateTime(createTime);
-						entity.setVoipIp(voipIp);
-						avContentCfgDao.insertAvVoipIp(entity);
-					}
-				}
-			}
-			
-			if(!StringUtil.isEmpty(entity.getVoipAccounts())){
-				for (AvVoipAccountCfg voipAccount : entity.getVoipAccounts()) {
-					if(!StringUtil.isEmpty(voipAccount.getCfgId())){
-						if(voipAccountIds.contains(","+voipAccount.getCfgId()+",")){
-							voipAccountIds=voipAccountIds.replace(voipAccount.getCfgId()+",", "");
-						}
-						//修改
-						entity.setEditorId(UserUtils.getUser().getId());
-						entity.setEditTime(editTime);
 						entity.setVoipAccount(voipAccount);
-						avContentCfgDao.updateAvVoipAccount(entity);
+						avContentCfgDao.insertAvVoipAccountCfg(entity);
-					}else{
+					}
-						//新增
+				}
-						entity.setCreatorId(UserUtils.getUser().getId());
+				if(entity.getNtcSubscribeIdCfgList()!=null){
-						entity.setCreateTime(createTime);
+					for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
-						entity.setVoipAccount(voipAccount);
+						if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
-						avContentCfgDao.insertAvVoipAccount(entity);
+							entity.setNtcSubscribeIdCfg(cfg);
+							avContentCfgDao.insertAvVoipKeywordCfg(entity);
 						}
 					}
 				}
-			if(!StringUtil.isEmpty(entity.getAreaCfg())){
+				//保存区域IP信息
-				for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+				if(entity.getAreaCfg()!=null){
-					if(!StringUtil.isEmpty(areaIpCfg.getCfgId())){
+					for(AreaIpCfg cfg:entity.getAreaCfg()){
-						if(areaCfgIds.contains(","+areaIpCfg.getCfgId()+",")){
+						cfg.initDefaultValue();
-							areaCfgIds=areaCfgIds.replace(areaIpCfg.getCfgId()+",", "");
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
-						}
+						areaIpCfgDao.saveAreaIpCfg(cfg);
-						//修改
-						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"
-																				,"ipType"
-																				,"ipPattern"
-																				,"srcIpAddress"
-																				,"portPattern"
-																				,"srcPort"
-																				,"destPort"
-																				,"protocol"
-																				,"direction"
-																				,"protocolId"
-																				});
-						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
 					}
 				}
-			}
+			} catch (Exception e) {
-			//delete 真是删除voipAccount信息
+				e.printStackTrace();
-			if(!StringUtil.isEmpty(voipAccountIds.replaceAll(",", ""))){
+				logger.info("获取编译ID出错");
-				voipAccountIds=voipAccountIds.substring(1,voipAccountIds.length());
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
-				for (String cfgId : voipAccountIds.split(",")) {
-					CfgIndexInfo cfg=new CfgIndexInfo();
-					AvVoipAccountCfg voipAccountCfg=new AvVoipAccountCfg();
-					voipAccountCfg.setCfgId(Long.parseLong(cfgId));
-					cfg.setVoipAccount(voipAccountCfg);
-					avContentCfgDao.deleteAvVoipAccount(cfg);
-				}
 			}
 			
-			//delete 真是删除voipAccount信息
+		}else{
-			if(!StringUtil.isEmpty(voipIpIds.replaceAll(",", ""))){
+			entity.setEditTime(new Date());
-				voipIpIds=voipIpIds.substring(1,voipIpIds.length());
+			entity.setEditorId(entity.getCurrentUser().getId());
-				for (String cfgId : voipIpIds.split(",")) {
-					CfgIndexInfo cfg=new CfgIndexInfo();
-					AvVoipIpCfg voipIpCfg=new AvVoipIpCfg();
-					voipIpCfg.setCfgId(Long.parseLong(cfgId));
-					cfg.setVoipIp(voipIpCfg);
-					avContentCfgDao.deleteAvVoipIp(cfg);
-				}
-			}
-			//delete 真是删除areaIpCfg信息
-			if(!StringUtil.isEmpty(areaCfgIds.replaceAll(",", ""))){
-				areaCfgIds=areaCfgIds.substring(1,areaCfgIds.length());
-				for (String cfgId : areaCfgIds.split(",")) {
-					CfgIndexInfo cfg=new CfgIndexInfo();
-					AreaIpCfg areaIpCfg=new AreaIpCfg();
-					areaIpCfg.setCfgId(Long.parseLong(cfgId));
-					areaIpCfgDao.deleteAreaIpCfgByCfgId(areaIpCfg);
-				}
-			}
-			
-			//修改
-			entity.setEditorId(UserUtils.getUser().getId());
-			entity.setEditTime(editTime);
 			avContentCfgDao.updateCfgIndexInfo(entity);
+			//无效子配置后，再新增子配置
+			avContentCfgDao.deleteAvVoipKeywordCfg(entity);
+			avContentCfgDao.deleteAvVoipAccountCfg(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());
+			if(entity.getVoipAccounts()!=null&&entity.getVoipAccounts().size()>0){
+				for (AvVoipAccountCfg voipAccount : entity.getVoipAccounts()) {
+					entity.setVoipAccount(voipAccount);
+					avContentCfgDao.insertAvVoipAccountCfg(entity);
+				}
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null){
+				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						entity.setNtcSubscribeIdCfg(cfg);
+						avContentCfgDao.insertAvVoipKeywordCfg(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);
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void updateAvVoipValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = compileIds.split(",");
+		for(String id :idArray){
+			entity.setCompileId(Integer.parseInt(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			avContentCfgDao.updateAvVoipIp(entity);
+			avContentCfgDao.updateAvVoipKeywordCfgt(entity);
+			avContentCfgDao.updateCfgIndexInfo(entity);
+			AreaIpCfg areaIpCfg=new AreaIpCfg();
+			BeanUtils.copyProperties(entity, areaIpCfg);
+			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
 		}
 	}
 	/**
@@ -285,9 +346,9 @@ public class AvContentCfgService extends BaseService{
 	 * @param ids compileIds
 	 */
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void updateAvVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public void updateAvVoipAccountValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){
 		CfgIndexInfo entity = new CfgIndexInfo();
-		String[] idArray = ids.split(",");
+		String[] idArray = compileIds.split(",");
 		for(String id :idArray){
 			entity.setCompileId(Integer.parseInt(id));
 			entity.setFunctionId(functionId);
@@ -295,8 +356,8 @@ public class AvContentCfgService extends BaseService{
 			entity.setIsValid(isValid);
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(new Date());
-			avContentCfgDao.updateAvVoipIp(entity);
 			avContentCfgDao.updateAvVoipAccount(entity);
+			avContentCfgDao.updateAvVoipKeywordCfgt(entity);
 			avContentCfgDao.updateCfgIndexInfo(entity);
 			AreaIpCfg areaIpCfg=new AreaIpCfg();
 			BeanUtils.copyProperties(entity, areaIpCfg);
@@ -316,7 +377,7 @@ public class AvContentCfgService extends BaseService{
 		
 		List<CfgIndexInfo> list = new ArrayList();
 		List<AvVoipIpCfg> voipIpList = new ArrayList();
-		List<AvVoipAccountCfg> voipAccountList = new ArrayList();
+		List <NtcSubscribeIdCfg> ntcList = new ArrayList();
 		List<AreaIpCfg> areaIpCfgList = new ArrayList();
 		
 		CfgIndexInfo searchCfg=new CfgIndexInfo();
@@ -328,16 +389,16 @@ public class AvContentCfgService extends BaseService{
 		entity.setAuditorId(UserUtils.getUser().getId());
 		entity.setAuditTime(auditTime);
 		
-		
 		avContentCfgDao.updateAvVoipIp(entity);
-		avContentCfgDao.updateAvVoipAccount(entity);
+		avContentCfgDao.updateAvVoipKeywordCfgt(entity);
+		
 		avContentCfgDao.updateCfgIndexInfo(entity);
 		AreaIpCfg areaIpCfg=new AreaIpCfg();
 		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType","cfgId"});
 		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
 		
 		voipIpList=avContentCfgDao.findVoipIpCfgList(entity);
-		voipAccountList=avContentCfgDao.findVoipAccountCfgList(entity);
+		ntcList=avContentCfgDao.findSubscribeIdCfgList(entity);
 		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		
 		ToMaatBean maatBean = new ToMaatBean();		
@@ -357,8 +418,122 @@ public class AvContentCfgService extends BaseService{
 				ipRegionList=ipMap.get("dstList");
 			}
 			
-			if(!StringUtil.isEmpty(voipAccountList)){
+			if(!StringUtil.isEmpty(ntcList)){
-				Map<String,List> accountMap = cfgConvert(strRegionList,voipAccountList,2,entity,groupRelationList);
+				Map<String,List> ntcMap = cfgConvert(strRegionList,ntcList,2,entity,groupRelationList);
+				groupRelationList=ntcMap.get("groupList");
+				strRegionList=ntcMap.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(auditTime);
+			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(auditTime);
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("voip IP配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			logger.info("voip IP配置下发响应信息："+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(auditTime);
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("voip IP配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.put(json,1);
+			logger.info("voip IP配置取消配置响应信息："+result.getMsg());
+		}
+		
+		
+	}
+	/********************************voip业务*********************************/
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids 编译Id
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditAvVoipAccount(Integer isAudit,Integer isValid,Integer functionId,String compileId,Date auditTime){
+		CfgIndexInfo entity = new CfgIndexInfo();
+		
+		List<CfgIndexInfo> list = new ArrayList();
+		List<AvVoipAccountCfg> accountList = new ArrayList();
+		List <NtcSubscribeIdCfg> ntcList = new ArrayList();
+		List<AreaIpCfg> areaIpCfgList = new ArrayList();
+		
+		CfgIndexInfo searchCfg=new CfgIndexInfo();
+		searchCfg.setCompileId(Integer.parseInt(compileId));
+		
+		entity = avContentCfgDao.getCfgIndexInfo(searchCfg);
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		
+		avContentCfgDao.updateAvVoipAccount(entity);
+		avContentCfgDao.updateAvVoipKeywordCfgt(entity);
+		
+		avContentCfgDao.updateCfgIndexInfo(entity);
+		AreaIpCfg areaIpCfg=new AreaIpCfg();
+		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType","cfgId"});
+		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+		
+		ntcList=avContentCfgDao.findSubscribeIdCfgList(entity);
+		accountList=avContentCfgDao.findVoipAccountCfgList(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(ntcList)){
+				Map<String,List> accountMap = cfgConvert(strRegionList,ntcList,2,entity,groupRelationList);
+				groupRelationList=accountMap.get("groupList");
+				strRegionList=accountMap.get("dstList");
+			}
+			if(!StringUtil.isEmpty(accountList)){
+				Map<String,List> accountMap = cfgConvert(strRegionList,accountList,2,entity,groupRelationList);
 				groupRelationList=accountMap.get("groupList");
 				strRegionList=accountMap.get("dstList");
 			}
@@ -391,10 +566,11 @@ public class AvContentCfgService extends BaseService{
 			maatBean.setOpAction(Constants.INSERT_ACTION);
 			//调用服务接口下发配置数据
 			String json=gsonToJson(maatBean);
-			logger.info("voip配置下发配置参数："+json);
+			logger.info("voip Account配置下发配置参数："+json);
+			System.err.println(json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
-			logger.info("voip配置下发响应信息："+result.getMsg());
+			logger.info("voip Account配置下发响应信息："+result.getMsg());
 			
 		}else if(isAudit==3){
 			maatCfg.setCompileId(entity.getCompileId());
@@ -408,10 +584,10 @@ public class AvContentCfgService extends BaseService{
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
 			//调用服务接口取消配置
 			String json=gsonToJson(maatBean);
-			logger.info("voip配置下发配置参数："+json);
+			logger.info("voip Account配置下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.put(json,1);
-			logger.info("voip配置取消配置响应信息："+result.getMsg());
+			logger.info("voip Account配置取消配置响应信息："+result.getMsg());
 		}
 		
 		

src/main/resources/messages/message_en.properties

@@ -1080,3 +1080,4 @@ app_built_in_features_config=APP Built-in Features
 app_ssl_config=APP SSL Cert Feature
 PXY_INTERCEPT_PKT_BIN=Intercept Messages
 certificate=Certificate
+app_ssl_config=APP SSL Cert Feature

src/main/resources/nis.properties

@@ -237,6 +237,7 @@ ntcDestipCountryReport=ntcDestipCountryReport
 ntcEntranceReport=ntcEntranceReport
 ntcIpLog=ntcIpLogs
 ntcBgpLog=ntcBgpLogs
+ntcP2pLog=ntcP2pLogs
 ntcHttpLog=ntcHttpLogs
 ntcDnsLog=ntcDnsLogs
 ntcSslLog=ntcSslLogs
@@ -265,7 +266,7 @@ mmSamplePicLog=mmSamplePicLogs
 mmSampleVoipLog=mmSampleVoipLogs
 pxyHttpLog=pxyHttpLogs
 ########################################
-#大屏图表展示服务接口
+#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
 dashboardUrl=http://10.0.6.242:8080/galaxy/service/log/v1/
 trafficIpActive=trafficIpActive
 trafficProtocol=trafficProtocol
@@ -283,7 +284,7 @@ log_time_range=300000
 #use elasticsearch or not#
 isUseES=false
 
-#httpclient 工具设置超时时间
+#httpclient \u5de5\u5177\u8bbe\u7f6e\u8d85\u65f6\u65f6\u95f4
 http_socket_timeout=300000
 http_connect_timeout=10000
 http_connect_request_timeout=50000
@@ -296,7 +297,7 @@ jdbc.hive.AName=xa_dfbhit_hive
 jdbc.hive.BName=xa_z2_mesalog_hive
 
 maxPageSize=100000
-#导出最大条数
+#\u5bfc\u51fa\u6700\u5927\u6761\u6570
 maxExportSize=100000
 #\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7
 maxLevelNo=4
@@ -331,16 +332,16 @@ ssl_ip_region=ssl_ip
 bgp_ip_region=bgp_ip
 behav_id_region=BEHAV_ID
 rate_limit_region=RATE_LIMIT
-#存在与表达式的关键字特殊分隔符
+#\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26
 keyword_expr=***and***
-#时区
+#\u65f6\u533a
 time_zone=8
-#需要特殊处理的业务类型
+#\u9700\u8981\u7279\u6b8a\u5904\u7406\u7684\u4e1a\u52a1\u7c7b\u578b
 service_pxy_domain_intercept=513
 service_ip_mulitiplex=768
 service_ip_ratelimit=1057
 service_domain_ratelimit=1058
-#用户自定义域
+#\u7528\u6237\u81ea\u5b9a\u4e49\u57df
 userregion_rate_limit=RATE_LIMIT
 userregion_ir_strategy=IR_STRATEGY
 userregion_ir_type=IR_TYPE
@@ -350,25 +351,25 @@ userregion_replace_type_key=zone
 userregion_replace_req_key_value=http_req_body
 userregion_replace_res_key_value=http_res_body
 userregion_replace_regex_key=regex
-#用户自定义域占位符
+#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5360\u4f4d\u7b26
 user_region_placeholder=0
-#用户自定义域分隔符
+#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5206\u9694\u7b26
 user_region_split=;
-#IP相关验证正则
+#IP\u76f8\u5173\u9a8c\u8bc1\u6b63\u5219
 ipv4_ip_subnet_regexp=^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}/(3[0-2]|[1-2][0-9]|[0-9])$
 ipv6_ip_subnet_regexp=^\\s*((([0-9A-Fa-f]{1,4}\:){7}(([0-9A-Fa-f]{1,4})|\:))|(([0-9A-Fa-f]{1,4}\:){6}(\:|(\:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}\:){5}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){4}(\:[0-9A-Fa-f]{1,4}){0,1}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){3}(\:[0-9A-Fa-f]{1,4}){0,2}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){2}(\:[0-9A-Fa-f]{1,4}){0,3}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:)(\:[0-9A-Fa-f]{1,4}){0,4}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(\:(\:[0-9A-Fa-f]{1,4}){0,5}((\:)|((\:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\\s*/(0|2|4|8|16|32|64|128)$
 ipv4_ip_range_regexp=^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}-(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$
 ipv6_ip_range_regexp=^\\s*((([0-9A-Fa-f]{1,4}\:){7}(([0-9A-Fa-f]{1,4})|\:))|(([0-9A-Fa-f]{1,4}\:){6}(\:|(\:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}\:){5}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){4}(\:[0-9A-Fa-f]{1,4}){0,1}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){3}(\:[0-9A-Fa-f]{1,4}){0,2}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){2}(\:[0-9A-Fa-f]{1,4}){0,3}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:)(\:[0-9A-Fa-f]{1,4}){0,4}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(\:(\:[0-9A-Fa-f]{1,4}){0,5}((\:)|((\:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\\s*-\\s*((([0-9A-Fa-f]{1,4}\:){7}(([0-9A-Fa-f]{1,4})|\:))|(([0-9A-Fa-f]{1,4}\:){6}(\:|(\:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}\:){5}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){4}(\:[0-9A-Fa-f]{1,4}){0,1}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){3}(\:[0-9A-Fa-f]{1,4}){0,2}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){2}(\:[0-9A-Fa-f]{1,4}){0,3}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:)(\:[0-9A-Fa-f]{1,4}){0,4}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(\:(\:[0-9A-Fa-f]{1,4}){0,5}((\:)|((\:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\\s*$
 ipv4_ip_regexp=^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$
 ipv6_ip_regexp=^\\s*((([0-9A-Fa-f]{1,4}\:){7}(([0-9A-Fa-f]{1,4})|\:))|(([0-9A-Fa-f]{1,4}\:){6}(\:|(\:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}\:){5}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){4}(\:[0-9A-Fa-f]{1,4}){0,1}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){3}(\:[0-9A-Fa-f]{1,4}){0,2}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){2}(\:[0-9A-Fa-f]{1,4}){0,3}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:)(\:[0-9A-Fa-f]{1,4}){0,4}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(\:(\:[0-9A-Fa-f]{1,4}){0,5}((\:)|((\:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\\s*$
-#重定向业务自定义域相关参数
+#\u91cd\u5b9a\u5411\u4e1a\u52a1\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570
 redirect_response_code_key=code
 redirect_url_key=url
 redirect_content_key=content
 redirect_response_code_startwith=30
 replace_zone_key=zone
 replace_substitute_key=substitute
-#样例文件上传的uri关键词
+#\u6837\u4f8b\u6587\u4ef6\u4e0a\u4f20\u7684uri\u5173\u952e\u8bcd
 sample_upload_url_keyword=/av
 digest_upload_url_keyword=/filetransfer
 
@@ -377,36 +378,36 @@ sample_total_file_max_size=12582912
 
 #audio File Types
 audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
-#audio File Size 10M 10485760（single） 
+#audio File Size 10M 10485760\uff08single\uff09 
 audio_single_file_max_size=10485760
 #video File Types
 video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,
-#video File Size 10M 10485760（single） 
+#video File Size 10M 10485760\uff08single\uff09 
 video_single_file_max_size=10485760
 #picture File Types
 picture_file_type=,bmp,jpg,tiff,raw,gif,
-#picture File Size 10M 10485760（single） 
+#picture File Size 10M 10485760\uff08single\uff09 
 picture_single_file_max_size=10485760
 #voip File Types
 voip_file_type=,mp3,mp4,flv,ivf,mp2v,jpg,
-#voip File Size 10M 10485760（single） 
+#voip File Size 10M 10485760\uff08single\uff09 
 voip_single_file_max_size=10485760
 
 #digest File Types
 digest_file_type=,txt,doc,img,docx,pptx,xlsx,xls,ppt,
-#digest File Size 10M 10485760（single）
+#digest File Size 10M 10485760\uff08single\uff09
 digest_single_file_max_size=10485760
-#digest File Size 12M 12582912（total） 
+#digest File Size 12M 12582912\uff08total\uff09 
 digest_total_file_max_size=12582912
-#YSP文件保存路径
+#YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84
 #av_file_path=/home/ysp/
 av_file_path=D\:\\ysp\\
-#YSP文件特征类型
+#YSP\u6587\u4ef6\u7279\u5f81\u7c7b\u578b
 av_sample_audio_region=av_sample_audio
 av_sample_video_region=av_sample_video
 av_sample_picture_region=av_sample_picture
 av_sample_voip_region=av_sample_voip
-#样例文件生成程序
+#\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f
 #audio_sample_create_proc=java -jar /home/sampleTest.jar
 #video_sample_create_proc=java -jar /home/sampleTest.jar
 #picture_sample_create_proc=java -jar /home/sampleTest.jar
@@ -425,34 +426,34 @@ picture_sample_proc_param_is_quotation=false
 audio_sample_proc_param_is_translation=true
 video_sample_proc_param_is_translation=true
 picture_sample_proc_param_is_translation=true
-#http自定义域相关参数
+#http\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570
 http_header_user_region_key=HTTP_HEADER
 http_header_dict_module=HTTP_HEADER_DISTRICT
-#dns自定义域参数key
+#dns\u81ea\u5b9a\u4e49\u57df\u53c2\u6570key
 dns_strategy_user_region_key=DNS_STRATEGY
-#p2p自定义域key
+#p2p\u81ea\u5b9a\u4e49\u57dfkey
 p2p_ip_type_user_region_key=P2P_IP_TYPE
 p2p_hash_type_user_region_key=P2P_HASH_TYPE
-#特定服务类别
+#\u7279\u5b9a\u670d\u52a1\u7c7b\u522b
 specific_service_cfg_type_app=social_app
 specific_service_cfg_type_encrypted_tunnel_behavior=encrypted_tunnel_behavior
 specific_service_cfg_type_basic_protocol=basic_protocol
-#基础协议自定义域
+#\u57fa\u7840\u534f\u8bae\u81ea\u5b9a\u4e49\u57df
 proto_id_region=PROTO_ID
-#IP默认值
+#IP\u9ed8\u8ba4\u503c
 ipv4_default_ip_value=\:\:
 ipv4_default_ip_subnet_value=0.0.0.0/32
 ipv6_default_ip_subnet_value=::/64
 ipv4_default_ip_range_value=0.0.0.0-0.0.0.0
 ipv6_default_ip_range_value=::-::
-#端口默认值
+#\u7aef\u53e3\u9ed8\u8ba4\u503c
 port_default=0
 port_mask_default=0/65535
-#MAAT CFG 一些默认值
+#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c
 maat_cfg_dolog_default=1
 maat_cfg_dolog_doblacklist_default=1
 maat_cfg_dolog_configpercent_default=100
 maat_cfg_dolog_configoption_default=1
-#app，基础协议，特定服务的userregion分隔符
+#app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26
 app_cfg_userregion_splitor=&
 app_id_region=APP_ID

src/main/webapp/WEB-INF/sitemesh3.xml

@@ -30,6 +30,7 @@
   <mapping path="/nis/report/ajax*" exclue="true"/>
   <mapping path="/nis/basicprotocol/ajax*" exclue="true"/>
   <mapping path="/nis/encryptedtunnelbehav/ajax*" exclue="true"/>
+  <mapping path="/nis/ntc/av/ajax*" exclue="true"/>
   <!-- 对同一路径，启用多个装饰器 -->
   <mapping>
     <path>/articles/*</path>

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -174,6 +174,8 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					}
 					if(url.indexOf("?isAudit") > 1){
 						loading('<spring:message code="onloading"/>');
+					}else if(url.indexOf("export") > 1){
+						closeTip();
 					}
 					//$("#searchForm").submit();
 				}
@@ -236,12 +238,14 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					if(v=="ok"){
 						$("#searchForm").attr("action",url);
 						$("#searchForm").submit();
+						closeTip();
 					}
 				},{buttonsFocus:1});
 				top.$('.jbox-body .jbox-icon').css('top','55px');
 			}else{
 				$("#searchForm").attr("action",url);
 				$("#searchForm").submit();
+				closeTip();
 			}
 		}
 	}

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

@@ -0,0 +1,311 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
+<style type="text/css">
+.boxSolid {
+	border: 1px solid #eeeeee
+}
+</style>
+<script type="text/javascript">
+	$(document)
+			.ready(
+					function() {
+						$("#cancel").on("click", function() {
+							window.history.back();
+						});
+						$(".action").on("change", function() {
+							$("#serviceId").val($(this).attr("serviceId"));
+							$("#protocolId").val($(this).attr("protocolId"));
+						});
+						$("#serviceId").val($(".action:checked").attr("serviceId"));
+						$("#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);
+									}
+								},
+									submitHandler : function(form) {
+										
+										var flag = true;
+										//代表所有业务都隐藏了，提示必须增加一种业务数据
+										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;
+											}
+										})
+										//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();
+												if(keywords != ''){
+													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+														$(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(){
+												$(this).remove();
+											});
+											$("input[name$='exprType']").attr("disabled",false);
+											loading('onloading...');
+											form.submit();
+										}else{
+											return;
+										}
+										
+									},
+									errorContainer : "#messageBox",
+								});
+						//业务内容增加
+						/* $("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");
+		/* $("."+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>
+</head>
+<body>
+	<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="av_voip_account_control"></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/saveAccountVoip"  
+							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}">
+
+							<div class="form-body">
+
+
+								<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>>
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
+														</c:if>
+													</label>
+												</c:forEach>
+											</div>
+											<div for="action"></div>
+										</div>
+									</div>
+								</div>
+								<c:set var="accountCfgIndex" value="0"></c:set>
+								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${region.regionType eq 2 }">
+									<c:if test="${region.configRegionValue eq 'MM_VOIP_ACCOUNT' }">
+										<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="voipAccounts[${accountCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.voipAccounts)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.voipAccounts}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+									<!-- 关键字 -->									
+									<c:if test="${region.configRegionValue eq 'NTC_SUBSCRIBE_ID' }">
+										<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="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}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+									</c:if>
+								</c:forEach>
+								<br>
+								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+								<br>
+								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
+								<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>
+
+
+							</div>
+						</form>
+						<!-- END FORM-->
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>

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

@@ -0,0 +1,667 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
+<link href="${pageContext.request.contextPath}/static/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
+<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<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.ntcSubscribeIdCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
+		}else if("${cfg.voipAccount.cfgKeywords}"){
+			$("#intype").val("${cfg.voipAccount.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",'');
+			$("#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");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+			var cfgId=$(this).attr("cfgId");
+			var hasSubscribe=false;
+			var hasAccount=false;
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/av/ajaxVoipAccountInfo',
+					data:{"compileId":compileId,"cfgId":cfgId},
+					success:function(data){
+						var voipIpCfgTab="<tr class='child'>"+
+										 	"<td style='border-right: 1px solid #FFFFFF;'>"+
+										 		"<input type='checkbox' hidden='hidden'/>"+
+										 	"</td>"+
+										 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						/* 订阅关键字 */
+						if(data.subscribe.length >0){
+							hasSubscribe=true;
+							html+="<div id='subscribeTitle"+index+"' onclick='switchInfo(\"account\","+index+")' class='col-md-1 tabInfo badge-info' >";
+							html+="<spring:message code='NTC_SUBSCRIBE_ID'/>";
+							html+="<i id='subscribeDown"+index+"' class='fa fa-angle-double-down '></i>";
+							html+="<i id='subscribeUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
+							html+="</div>";
+						}
+						
+						if(data.account.length >0){
+							hasAccount=true;
+							html+="<div id='accountTitle"+index+"'  onclick='switchInfo(\"subscribe\","+index+")' class='col-md-1 tabInfo' >";
+							html+="<spring:message code='av_voip_account_title'/>";
+							html+="<i id='accountDown"+index+"' class='fa fa-angle-double-down '></i>";
+							html+="<i id='accountUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
+							html+="</div>";
+						}
+						
+						
+						html+="</div>";
+						//subscribe信息
+						if(data.subscribe.length > 0){
+							html+="<div  id='subscribeInfo"+index+"' class='content'>";
+							$.each(data.subscribe,function(index,item){
+								console.log(item.cfgKeywords);
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='NTC_SUBSCRIBE_ID'/>：</label>";
+								html+="<label>"
+								html+=item.cfgKeywords.replace(/\*\*\*and\*\*\*/g , " ");
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='whether_hexbinary'/>：</label>";
+								html+="<label>"
+								if(item.isHexbin==1){
+									html+="<spring:message code='hex_binary'/>"
+								}
+								if(item.isHexbin==2){
+									html+="<spring:message code='case_sensitive_nohex'/>"
+								}
+								if(item.isHexbin==0){
+									html+="<spring:message code='case_insensitive_nohex'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='expression_type'/>：</label>";
+								html+="<label>"
+								if(item.exprType==1){
+									html+="<spring:message code='and_expression'/>"
+								}
+								if(item.exprType==0){
+									html+="<spring:message code='null_expression'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='match_method'/>：</label>";
+								html+="<label>"
+								if(item.matchMethod==0){
+									html+="<spring:message code='substring_match'/>"
+								}
+								if(item.matchMethod==1){
+									html+="<spring:message code='right_match'/>"
+								}
+								if(item.matchMethod==2){
+									html+="<spring:message code='left_match'/>"
+								}
+								if(item.matchMethod==3){
+									html+="<spring:message code='exactly_match'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								/* if(index < (data.ip.length-1) && index != 0){
+									alert("下一行");
+								} 
+								html+="<h5 class='page-header'></h5>";*/
+							})
+							html+="</div>";
+						} 
+						//account信息
+						if(data.account.length > 0){
+							html+="<div  id='accountInfo"+index+"' class='content' style='display:none'>";
+							$.each(data.account,function(index,item){
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='account'/>：</label>";
+								html+="<label>"
+									html+=item.cfgKeywords.replace(/\*\*\*and\*\*\*/g , " ");
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='whether_hexbinary'/>：</label>";
+								html+="<label>"
+								if(item.isHexbin==1){
+									html+="<spring:message code='hex_binary'/>"
+								}
+								if(item.isHexbin==2){
+									html+="<spring:message code='case_sensitive_nohex'/>"
+								}
+								if(item.isHexbin==0){
+									html+="<spring:message code='case_insensitive_nohex'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='expression_type'/>：</label>";
+								html+="<label>"
+								if(item.exprType==1){
+									html+="<spring:message code='and_expression'/>"
+								}
+								if(item.exprType==0){
+									html+="<spring:message code='null_expression'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='match_method'/>：</label>";
+								html+="<label>"
+								if(item.matchMethod==0){
+									html+="<spring:message code='substring_match'/>"
+								}
+								if(item.matchMethod==1){
+									html+="<spring:message code='right_match'/>"
+								}
+								if(item.matchMethod==2){
+									html+="<spring:message code='left_match'/>"
+								}
+								if(item.matchMethod==3){
+									html+="<spring:message code='exactly_match'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								/* if(index < (data.ip.length-1) && index != 0){
+									alert("下一行");
+								} 
+								html+="<h5 class='page-header'></h5>";*/
+							})
+							html+="</div>";
+						} 
+							
+						voipIpCfgTab=voipIpCfgTab+html;
+						voipIpCfgTab+="</td>";
+						voipIpCfgTab+="</tr>";
+						$("#"+openId).parent().parent().after(voipIpCfgTab);
+						if(hasSubscribe && ! hasAccount){
+							switchInfo("account",index);
+						}
+						if(hasAccount && ! hasSubscribe){
+							switchInfo("subscribe",index);
+						}
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
+	}); 
+	
+	function switchInfo(flag,index){
+		
+		if("account" ==flag){
+			//关闭account信息
+			$("#accountInfo"+index).hide();
+			$("#downAccount"+index).hide();
+			$("#accountTitle"+index).removeClass("badge-info");
+			$("#subscribeInfo"+index).show();
+			$("#subscribeDown"+index).show();
+			$("#accountUp"+index).show();
+			$("#accountDown"+index).hide();
+			$("#subscribeUp"+index).hide();
+			$("#subscribeTitle"+index).addClass("badge-info");
+			
+		}else{
+			//关闭subscribe信息
+			$("#subscribeInfo"+index).hide();
+			$("#downsubscribe"+index).hide();
+			$("#subscribeTitle"+index).removeClass("badge-info");
+			$("#accountInfo"+index).show();
+			$("#accountDown"+index).show();
+			$("#subscribeUp"+index).show();
+			$("#subscribeDown"+index).hide();
+			$("#accountUp"+index).hide();
+			$("#accountTitle"+index).addClass("badge-info");
+		}
+		
+		
+	}
+	
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		<shiro:hasPermission name="avVoip:config">
+		<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/ntc/av/voipAccountForm?functionId=${cfg.functionId}'">
+		<i class="fa fa-plus"></i>
+		<spring:message code="add"></spring:message></button>
+		</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+		<spring:message code="av_voip_account_control"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+		<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/voipAccountList?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="voipAccount.cfgKeywords"><spring:message code="account"/></form:option>
+												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-small" 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="avVoip:config">
+							 			<sys:delRow url="${ctx}/ntc/av/voipAccountForm" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/av/updateAvVoipAccountValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                                    <%-- <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>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right">
+	                                            <li><sys:delRow url="${ctx}/ntc/av/auditAvVoipAccount?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvVoipAccount?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvVoipAccount?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">
+					<sys:message content="${message}" />
+						<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 class="cfgDesc"><spring:message code="config_describe"/></th>
+									<th><spring:message code="block_type"/></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><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>
+									<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>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
+								<tr>
+									<td>
+									<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" id="${indexCfg.cfgId}" compileId="${indexCfg.compileId}" value="${indexCfg.isAudit}">
+									</td>
+								    <td>${indexCfg.cfgDesc }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
+									</td>
+									<td>${indexCfg.requestName }</td>
+									<td >
+										<c:set var="classify"></c:set>
+										<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}">
+													<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>
+										<a href="javascript:;" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>
+									</td>
+									<td>
+										<c:set var="attribute"></c:set>
+										<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}">
+													<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>
+										<a href="javascript:;" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>
+									</td>
+									<td>
+										<c:set var="lableInfo"></c:set>
+										<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}">
+													<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>
+										<a href="javascript:;" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
+									</td>
+								    <td>
+										<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>
+										<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 functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><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" style="margin-top:40px">${page}</div>
+					</div>
+					
+				</div>
+			</div>
+</div>
+
+</body>
+</html>

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

@@ -3,15 +3,17 @@
 <html>
 <head>
 <title><spring:message code="${cfgName}"></spring:message></title>
-<!-- BEGIN THEME GLOBAL STYLES -->
+
 <style type="text/css">
-.boxSolid{
+.boxSolid {
-border:1px solid #eeeeee
+	border: 1px solid #eeeeee
 }
 </style>
 <script type="text/javascript">
-$(function(){
+	$(document)
-	$("#cancel").on("click",function(){
+			.ready(
+					function() {
+						$("#cancel").on("click", function() {
 							window.history.back();
 						});
 						$(".action").on("change", function() {
@@ -20,111 +22,153 @@ $(function(){
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
-	$("#cfgFrom").validate({
+						$("#cfgFrom").validate(
-		errorPlacement: function(error,element){
+								{ errorPlacement : function(error, element) {
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+										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);
+										}
 									},
-		submitHandler: function(form){
+									submitHandler : function(form) {
+										
+										var flag = true;
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
 										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;
+											}
+										})
+										//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();
+												if(keywords != ''){
+													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+														$(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(){
+												$(this).remove();
+											});
+											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
-		},
+										}else{
-		errorContainer: "#messageBox",
+											return;
-	});
-	$(".action").on("change",function(){
-		$("#serviceId").val($(this).attr("serviceId"));
-	});
-	$(".disabled").each(function(){
-		$(this).find("input,select,div,button").each(function(){
-			$(this).attr("disabled","true");
-		});
-	});
-	//新增 默认不展示配置信息
-	if($("input[name=cfgId]").val() == ''){
-		$(".glyphicon-remove").click();
 										}
-});
 										
-//业务窗口打开
+									},
-var addContent=function(obj,contentClassName){
+									errorContainer : "#messageBox",
-	$("."+contentClassName+"0").removeClass("hidden").removeClass("disabled");
+								});
-	$("."+contentClassName+"0").find("input,select").each(function(){
+						//业务内容增加
+						/* $("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");
+		/* $("."+contentClassName+"0").find("input,select").each(function(){
 			$(this).removeAttr("disabled");
-	});
+		}); */
-	$("."+contentClassName+"0").find(".disabled").each(function(){
-		$(this).removeClass("disabled");
-	});
 		$(obj).addClass("hidden");
-}
+	}
 
-//业务窗口关闭
+	//业务窗口关闭
-var delContent=function(contentClassName,addBtnClassName){
+	var delContent = function(contentClassName, addBtnClassName) {
-	$("."+contentClassName).addClass("hidden");
+		$("." + contentClassName).addClass("hidden").addClass("disabled");
-	$("."+contentClassName).find("input,select").each(function(){
+		/* $("."+contentClassName).find("input,select").each(function(){
 			$(this).attr("disabled","true");
-	});
+		}); */
-	
+		$("." + addBtnClassName).removeClass("hidden");
-	$("."+addBtnClassName).removeClass("hidden");
+	}
-}
-
 </script>
 </head>
 <body>
-
+	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
-<div class="page-content">
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-<h3 class="page-title">
+	<div class="page-content">
-		<spring:message code="av_voip_control"></spring:message>
+		<h3 class="page-title">
+			<spring:message code="av_voip_ip_control"></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="${empty _cfg.cfgId}">
-						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+								<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/saveVoip" method="post" class="form-horizontal">
+						<form id="cfgFrom" action="${ctx}/ntc/av/saveVoip"  
+							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"
-                       	<c:set var="voipIpCfgId" value=""/>
+								value="${_cfg.serviceId}">
-                       	<c:forEach items="${_cfg.voipIps}" var="voipIp" varStatus="status">
+
-	                       	<c:if test="${not empty voipIp.cfgId}">
-	                       		<c:set var="voipIpCfgId" value="${voipIpCfgId},${voipIp.cfgId}"/>
-	                       	</c:if>
-                       	</c:forEach>
-                        <input type="hidden" name="voipIpIds" value="${voipIpCfgId}">
-                       	<c:set var="voipAccountCfgId" value=""/>
-                       	<c:forEach items="${_cfg.voipAccounts}" var="voipAccount" varStatus="status">
-	                       	<c:if test="${not empty voipAccount.cfgId}">
-	                       		<c:set var="voipAccountCfgId" value="${voipAccountCfgId},${voipAccount.cfgId}"/>
-	                       	</c:if>
-                       	</c:forEach>
-                        <input type="hidden" name="voipAccountIds" value="${voipAccountCfgId}">
 							<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>
+											<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">
@@ -145,303 +189,117 @@ var delContent=function(contentClassName,addBtnClassName){
 												</c:forEach>
 											</div>
 											<div for="action"></div>
+											
+											
+											
+											
 										</div>
 									</div>
 								</div>
-							<!-- desc and action -->
+								<c:set var="ipCfgIndex" value="0"></c:set>
-							<!-- 动态展示各个域信息start -->
+								<c:set var="strCfgIndex" value="0"></c:set>
-							<c:forEach items="${regionList}" var="region">
+								<c:forEach items="${regionList}" var="region" varStatus="status">
-	                   			<!-- 字符串类域配置 -->
+									<c:if test="${region.regionType eq 1 }">
-	                   			<c:if test="${region.regionType==2 }">
+										<!--ip info-->
-	                   				<!--account info-->
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-									<h4 class="form-section"> <spring:message code="av_voip_account_title"/><small> <span class="glyphicon glyphicon-plus voipAccountAdd" onClick="addContent(this,'voipAccount')" title="add"></span></small></h4>	
+										<h4 class="form-section">
-									<c:forEach items="${_cfg.voipAccounts}" var="voipAccount" varStatus="status">
+											<spring:message code="${region.configRegionValue}" />
-									<c:choose>
+											<small> <span
-										<c:when test="${not empty _cfg.cfgId}">
+												class="glyphicon glyphicon-plus  ${tabName}Add"
-											<c:choose>
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
-												<c:when test="${empty voipAccount.cfgId}">
-													<div class="row boxSolid hidden disabled voipAccount${status.index }">
-												</c:when>
-												<c:otherwise>
-													<div class="row boxSolid voipAccount${status.index }">
-												</c:otherwise>
-											</c:choose>
-										</c:when>
-										<c:otherwise>
-											<div class="row boxSolid voipAccount${status.index }">
-										</c:otherwise>
-									</c:choose>
-									<input type="hidden" name="voipAccounts[${status.index }].cfgId" value="${voipAccount.cfgId}">
-	                   				<input type="hidden" name="voipAccounts[${status.index }].cfgType" value="${region.configRegionValue}">
-	                   				<input type="hidden" name="voipAccounts[${status.index }].cfgRegionCode" value="${region.configRegionCode}">
-			                        <div class="row">
-										<div class="pull-right">
-											<span class="glyphicon glyphicon-remove pull-right" title="remove" onClick="delContent('voipAccount${status.index }','voipAccountAdd');"/>
-										</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="account"/></label>
-									            <div class="col-md-6">
-									            	 <input class="form-control required" type="text" name="voipAccounts[${status.index }].cfgKeywords" value="${voipAccount.cfgKeywords}">
-									            </div>
-									            <div for="voipAccounts[${status.index }].cfgKeywords"></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_hexbinary"/></label>
-									            <div class="col-md-6">
-									            	<select name="voipAccounts[${status.index }].isHexbin" class="selectpicker select2 form-control required">
-														<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-															<option value="${isHexbinC.itemCode}" <c:if test="${voipAccount.isHexbin==isHexbinC.itemCode || (voipAccount.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-								               			</c:forEach>
-													</select>
-									            </div>
-									            <div for="voipAccounts[${status.index }].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 hidden">
-									            		<input type="radio" name="voipAccounts[${status.index }].exprType" value="1"
-									            			<c:if test="${voipAccount.exprType==1}">checked</c:if>
-									            		><spring:message code="and_expression"/>
-									            	</label>
-									            	<label class="radio-inline">
-									            		<input type="radio" name="voipAccounts[${status.index }].exprType" value="0" class="required"
-									            			<c:if test="${voipAccount.exprType==0 || voipAccount.exprType==null}">checked</c:if>
-									            		><spring:message code="null_expression"/>
-									            	</label>
-									            </div>
-									            <div for="voipAccounts[${status.index }].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="voipAccounts[${status.index }].matchMethod" class="selectpicker select2 form-control required" >
-														<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-															<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==1)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
-								               			</c:forEach> 
-													</select>
-									            </div>
-									            <div for="voipAccounts[${status.index }].matchMethod"></div>
-									        </div>
-									    </div>
-									</div>
-									</div>
-									</c:forEach>
-									<!--account info-->
-	                   			</c:if>
-	                   			<!-- ip类域配置 -->
-	                   			<c:if test="${region.regionType==1 }">
-	                   				<!--/ip info-->
-									<h4 class="form-section"> <spring:message code="av_voip_ip_title"/><small>
-									<span  class="glyphicon glyphicon-plus voipIpAdd" onClick="addContent(this,'voipIp')" title="add"></span>
-									</small>
 										</h4>
-									<c:forEach items="${_cfg.voipIps}" var="voipIp" varStatus="status">
+										<c:set var="cfgName" value="voipIps[${ipCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
-										<c:when test="${not empty _cfg.cfgId}">
+											<c:when test="${fn:length(_cfg.voipIps)>0 and ipCfgIndex<fn:length(_cfg.voipIps) }">
-											<c:choose>
+												<c:forEach items="${_cfg.voipIps}" var="ipPort">
-												<c:when test="${empty voipIp.cfgId}">
+												<c:if test="${region.configRegionValue eq ipPort.cfgType }">
-													<div class="row boxSolid hidden disabled voipIp${status.index }">
+													<div class="row boxSolid ${tabName}${status.index}">
-												</c:when>
+														<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
-												<c:otherwise>
-													<div class="row boxSolid voipIp${status.index }">
-											</c:otherwise>
-											</c:choose>
-									</c:when>
-										<c:otherwise>
-											<div class="row boxSolid voipIp${status.index }">
-									</c:otherwise>
-									</c:choose>
-									
-									<input type="hidden" name="voipIps[${status.index }].protocolId" value="" id="protocolId">
-									<input type="hidden" name="voipIps[${status.index }].cfgId" value="${voipIp.cfgId}">
-	                   				<input type="hidden" name="voipIps[${status.index }].cfgType" value="${region.configRegionValue}">
-	                   				<input type="hidden" name="voipIps[${status.index }].cfgRegionCode" value="${region.configRegionCode}">
-			                        <div class="row">
-										<div class="pull-right">
-											<span class="glyphicon glyphicon-remove pull-right" title="remove" onClick="delContent('voipIp${status.index }','voipIpAdd');"/>
-										</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="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" varStatus="satus">
-														<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode || (voipIp.ipType==null && ipType.itemCode==4)}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
-							                			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="voipIps[${status.index }].ipType"></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="ip_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="voipIps[${status.index }].ipPattern" class="selectpicker show-tick form-control required">
-									                   <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC" varStatus="satus">
-														<option value="${ipPatternC.itemCode}" <c:if test="${voipIp.ipPattern==ipPatternC.itemCode || (voipIp.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if> ><spring:message code="${ipPatternC.itemValue}"/></option>
-							                			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="voipIps[${status.index }].ipPattern"></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="client_ip"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required ipCheck" type="text" name="voipIps[${status.index }].srcIpAddress" value="${voipIp.srcIpAddress}">
-									            </div>
-									            <div for="voipIps[${status.index }].srcIpAddress"></div>
-									        </div>
-									    </div>
-									</div>
-									<c:choose>
-										<c:when test="${voipIp.cfgId==null}">
-											<div class="row hidden port">
-										</c:when>
-										<c:otherwise>
-											<div class="row port">
-										</c:otherwise>
-									</c:choose>
-									    <div class="col-md-6">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="voipIps[${status.index }].portPattern" class="selectpicker show-tick form-control required">
-									                    <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC" varStatus="satus">
-														<option value="${portPatternC.itemCode}" <c:if test="${voipIp.portPattern==portPatternC.itemCode || (voipIp.portPattern==null && portPatternC.itemCode==1)}">selected</c:if> ><spring:message code="${portPatternC.itemValue}"/></option>
-							                			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="voipIps[${status.index }].portPattern"></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="client_port"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required portCheck" type="text" name="voipIps[${status.index }].srcPort" value="${voipIp.srcPort}">
-									            </div>
-									            <div for="voipIps[${status.index }].srcPort"></div>
-									        </div>
-									    </div>
-									</div>
-									<c:choose>
-										<c:when test="${voipIp.cfgId==null}">
-											<div class="row hidden destPort">
-										</c:when>
-										<c:otherwise>
-											<div class="row destPort">
-										</c:otherwise>
-									</c:choose>
-									    <div class="col-md-6">
-									        <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 class="form-control required ipCheck" type="text" name="voipIps[${status.index }].destIpAddress" value="${voipIp.destIpAddress}">
-									            </div>
-									            <div for="voipIps[${status.index }].destIpAddress"></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="server_port"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required portCheck" type="text" name="voipIps[${status.index }].destPort" value="${voipIp.destPort}">
-									            </div>
-									            <div for="voipIps[${status.index }].destPort"></div>
-									        </div>
-									    </div>
-									</div>
-									<c:choose>
-										<c:when test="${voipIp.cfgId==null}">
-											<div class="row hidden protocol">
-										</c:when>
-										<c:otherwise>
-											<div class="row protocol">
-										</c:otherwise>
-									</c:choose>
-									    <div class="col-md-6">
-									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
-									            <div class="col-md-6">
-									            	<select name="voipIps[${status.index }].protocol" class="selectpicker show-tick form-control required">
-									                   <c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC" varStatus="satus">
-														<option value="${protocolC.itemCode}" <c:if test="${voipIp.protocol==protocolC.itemCode || (voipIp.protocol==null && protocolC.itemCode==0)}">selected</c:if> ><spring:message code="${protocolC.itemValue}"/></option>
-							                			</c:forEach>
-									                </select>
-									            </div>
-									            <div for="voipIps[${status.index }].protocol"></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="direction"/></label>
-									            <div class="col-md-6">
-									            	<select name="voipIps[${status.index }].direction" class="selectpicker show-tick form-control required" >
-									                   <c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC" varStatus="satus">
-														<option value="${directionC.itemCode}" <c:if test="${voipIp.direction==directionC.itemCode || (voipIp.direction==null && directionC.itemCode==0)}">selected</c:if> ><spring:message code="${directionC.itemValue}"/></option>
-							                			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="voipIps[${status.index }].direction"></div>
-									        </div>
-									    </div>
-									</div>
-									<c:if test="${voipIp.cfgId==null}">
-										<div class="row">
-										<button type="button" class="btn btn-red-hollow center-block" onClick="more(this);" data-click-times="0"><spring:message code="show_more"/></button>
 													</div>	
+													<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>		
 												</c:if>
-									<br>
-									</div>
 												</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:forEach>
+									<c:if test="${region.regionType eq 2 }">
-							
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-							<!-- 动态展示各个域信息end -->
+										<h4 class="form-section">
-							<br>
+											<spring:message code="${region.configRegionValue}" />
-                           <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
+											<small> <span
-                            <br>
+												class="glyphicon glyphicon-plus ${tabName}Add"
-                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></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}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+								</c:forEach>
+								<br>
+								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+								<br>
+								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
 								<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="save" type="submit" class="btn green">
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+														<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 class="col-md-6"></div>
 									</div>
 								</div>
+
+
+							</div>
 						</form>
 						<!-- END FORM-->
 					</div>
 				</div>
 			</div>
 		</div>
-</div>
+	</div>
 </body>
 </html>

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

@@ -29,8 +29,8 @@
 			$("#intype").val("${cfg.voipIp.srcIpAddress}");
 		}else if("${cfg.voipIp.srcPort}"){
 			$("#intype").val("${cfg.voipIp.srcPort}");
-		}else if("${cfg.voipAccount.cfgKeywords}"){
+		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
-			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
+			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -52,6 +52,7 @@
 			$(".Wdate").attr("value",'');
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
 		
 		//异步获取voip相关信息
@@ -64,14 +65,14 @@
 			var compileId=$(this).attr("compileId");
 			var cfgId=$(this).attr("cfgId");
 			var hasIp=false;
-			var hasAccount=false;
+			var hasSubscribe=false;
 			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
 				$("#"+openId).parent().parent().next("tr").show();
 			}else{
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/ntc/av/ajaxVoipAndAccountInfo',
+					url:'${ctx}/ntc/av/ajaxVoipIpInfo',
 					data:{"compileId":compileId,"cfgId":cfgId},
 					success:function(data){
 						var voipIpCfgTab="<tr class='child'>"+
@@ -81,17 +82,17 @@
 										 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
 						var html="";
 						html+="<div class='row'>";
-						if(data.account.length >0){
+						if(data.subscribe.length >0){
-							hasAccount=true;
+							hasSubscribe=true;
-							html+="<div id='accountTitle"+index+"'  onclick='switchInfo(\"ip\","+index+")' class='col-md-1 tabInfo badge-info' >";
+							html+="<div id='subscribeTitle"+index+"'  onclick='switchInfo(\"ip\","+index+")' class='col-md-1 tabInfo badge-info' >";
-							html+="<spring:message code='av_voip_account_title'/>";
+							html+="<spring:message code='NTC_SUBSCRIBE_ID'/>";
-							html+="<i id='accountDown"+index+"' class='fa fa-angle-double-down '></i>";
+							html+="<i id='subscribeDown"+index+"' class='fa fa-angle-double-down '></i>";
-							html+="<i id='accountUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
+							html+="<i id='subscribeUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
 							html+="</div>";
 						}
 						if(data.ip.length >0){
 							hasIp=true;
-							html+="<div id='ipTitle"+index+"' onclick='switchInfo(\"account\","+index+")' class='col-md-1 tabInfo' >";
+							html+="<div id='ipTitle"+index+"' onclick='switchInfo(\"subscribe\","+index+")' class='col-md-1 tabInfo' >";
 							html+="<spring:message code='av_voip_ip_title'/>"; 
 							html+="<i id='ipDown"+index+"' class='fa fa-angle-double-down' style='display:none' ></i>";
 							html+="<i id='ipUp"+index+"' class='fa fa-angle-double-up '></i>";
@@ -99,16 +100,16 @@
 						}
 						
 						html+="</div>";
-						//account信息
+						//subscribe信息
-						if(data.account.length > 0){
+						if(data.subscribe.length > 0){
-							html+="<div  id='accountInfo"+index+"' class='content'>";
+							html+="<div  id='subscribeInfo"+index+"' class='content'>";
-							$.each(data.account,function(index,item){
+							$.each(data.subscribe,function(index,item){
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='account'/>：</label>";
+								html+="<label><spring:message code='NTC_SUBSCRIBE_ID'/>：</label>";
 								html+="<label>"
-								html+=item.cfgKeywords.replace("***and***", " ");
+								html+=item.cfgKeywords.replace(/\*\*\*and\*\*\*/g , " ");
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
@@ -324,11 +325,11 @@
 						voipIpCfgTab+="</td>";
 						voipIpCfgTab+="</tr>";
 						$("#"+openId).parent().parent().after(voipIpCfgTab);
-						if(hasAccount && ! hasIp){
+						if(hasSubscribe && ! hasIp){
 							switchInfo("ip",index);
 						}
-						if(hasIp && ! hasAccount){
+						if(hasIp && ! hasSubscribe){
-							switchInfo("account",index);
+							switchInfo("subscribe",index);
 						}
 					}
 				});
@@ -345,55 +346,27 @@
 		}); 
 	}); 
 	
-	/* function edit() {
-		var checkboxes = $(".child-checks:checked");
-		if (checkboxes.length == 0) {
-			alertx("<spring:message code='one_more'/>");
-		} else if (checkboxes.length > 1) {
-			alertx("<spring:message code='check_one'/>");
-		} else {
-			window.location.href = "${ctx}/cfg/dnsIp/form?cfgId=" + checkboxes.attr("id");
-		}
-	}
-	
-	function delCfg() {
-		var checkboxes = $(".child-checks:checked");
-		if (checkboxes.length == 0) {
-			alertx("<spring:message code='one_more'/>");
-		} else {
-			var ids = "";
-			checkboxes.each(function(){
-				ids = ids + $(this).attr("id") + ",";
-			});
-			console.log(ids);
-			if (confirm("<spring:message code='confirm_message'/>")) {
-				$("#fakeIds").val(ids);
-				$("#searchForm").attr("action","${ctx}/cfg/dnsIp/delete");
-				$("#searchForm").submit();
-			}
-		}
-	} */
 	function switchInfo(flag,index){
 			//关闭ip信息
 		if("ip" ==flag){
 			$("#ipInfo"+index).hide();
 			$("#downIp"+index).hide();
 			$("#ipTitle"+index).removeClass("badge-info");
-			$("#accountInfo"+index).show();
+			$("#subscribeInfo"+index).show();
-			$("#accountDown"+index).show();
+			$("#subscribeDown"+index).show();
-			$("#accountUp"+index).hide();
+			$("#subscribeUp"+index).hide();
 			$("#ipUp"+index).show();
 			$("#ipDown"+index).hide();
-			$("#accountTitle"+index).addClass("badge-info");
+			$("#subscribeTitle"+index).addClass("badge-info");
 		}else{
-		//关闭account信息
+		//关闭subscribe信息
-			$("#accountInfo"+index).hide();
+			$("#subscribeInfo"+index).hide();
-			$("#downAccount"+index).hide();
+			$("#downsubscribe"+index).hide();
-			$("#accountTitle"+index).removeClass("badge-info");
+			$("#subscribeTitle"+index).removeClass("badge-info");
 			$("#ipInfo"+index).show();
 			$("#ipDown"+index).show();
-			$("#accountUp"+index).show();
+			$("#subscribeUp"+index).show();
-			$("#accountDown"+index).hide();
+			$("#subscribeDown"+index).hide();
 			$("#ipUp"+index).hide();
 			$("#ipTitle"+index).addClass("badge-info");
 		}
@@ -416,7 +389,7 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="av_voip_control"/>
+		<spring:message code="av_voip_ip_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
@@ -455,7 +428,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></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."><spring:message code="account"/></form:option>
+												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp

@@ -0,0 +1,260 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>
+	P2P<spring:message code="log"></spring:message>
+</title>
+<script>
+	$(document).ready(function() {
+		//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",'');
+			$(':input','#searchForm')
+			.not(':button,:submit,:reset,:hidden')
+			.attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+		//筛选功能
+		filterActionInit();
+	});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+	</div>
+	<h3 class="page-title">
+		<spring:message code="p2p_control"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+	<div class="col-md-12">
+		<div class="portlet">
+			<div class="portlet-body">
+				<div class="row" >
+					<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/p2pLogs" method="post" class="form-search">
+						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<!-- 筛选按钮展开状态-->
+						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+						<!-- 搜索内容与操作按钮栏 -->
+						<div class="col-md-12">
+							<div class="pull-left">
+								<select path="action" class="selectpicker select2 input-small">
+									<option value=""><spring:message code="action"/></option>
+									<c:forEach items="${serviceList}" var="service"
+											varStatus="satus">
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%>
+												<option value="${dict.itemCode}" 
+													<c:if test="${log.action eq dict.itemCode}">
+														selected
+													</c:if>
+													>
+													<spring:message code="${dict.itemValue}"/>
+												</option>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+								</select>
+							</div>
+							<div class="pull-left">
+								<div class="input-group">
+                                	<div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+                                   	</div>
+                                   	<input name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+                          		</div> 
+                            </div>
+							<div class="pull-left">
+								<div class="input-group">
+                                    <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+                                   	</div>
+                                    <input name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+                          		</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">
+                               	<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-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                       	<form:select path="transProto" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
+                                   
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" 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="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clj_ip"></spring:message>：</label>
+										<input name="capIp" type="text" class="form-control" value="${log.capIp }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clientip"></spring:message>：</label>
+										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="serverip"></spring:message>：</label>
+										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- /筛选搜索内容栏    结束-->
+					</form:form>
+				</div>
+				<div class="table-responsive">
+					<sys:message content="${message}"/>
+					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
+						<thead>
+							<tr>
+								<th><spring:message code="cfg_id"/></th>
+								<th><spring:message code="action"/></th>
+								<th><spring:message code="found_time"/></th>
+								<th><spring:message code="entrance"/></th>
+								<th><spring:message code="clj_ip"/></th>
+								<th><spring:message code="protocol"/></th>
+								<th><spring:message code='addr_type'/></th>
+								<th><spring:message code="server_ip"/></th>
+								<th><spring:message code="client_ip"/></th>
+								<th><spring:message code="server_port"/></th>
+								<th><spring:message code="client_port"/></th>
+								<th><spring:message code="deviceid"/></th>
+								<th><spring:message code="direction"/></th>
+								<th><spring:message code="stream_type"/></th>
+								<%-- <th><spring:message code="nest_addr_list"/></th> --%>
+								<th><spring:message code='server_locate'/></th>
+								<th><spring:message code='client_locate'/></th>
+								<th><spring:message code='s_asn'/></th>
+								<th><spring:message code='d_asn'/></th>
+								<th><spring:message code='s_subscribe_id'/></th>
+								<th><spring:message code='d_subscribe_id'/></th>
+								<th><spring:message code='scene_file'/></th>
+							</tr>
+						</thead>
+						<tbody>
+							<c:forEach var="log" items="${page.list }" varStatus="status">
+								<tr>
+									<td>${log.cfgId } 
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>${log.foundTime }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td>${log.transProto }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
+											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td>${log.dPort }</td>
+									<td>${log.sPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
+											<c:if test="${streamType.itemCode eq log.streamDir}">${streamType.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<%-- <td>${log.addrList }</td> --%>
+									<td>${log.serverLocate}</td>
+									<td>${log.clientLocate}</td>
+									<td>${log.sAsn}</td>
+									<td>${log.dAsn}</td>
+									<td>${log.sSubscribeId}</td>
+									<td>${log.dSubscribeId}</td>
+									<td>${log.sceneFile}</td>
+								</tr>
+							</c:forEach>
+						</tbody>
+					</table>
+					<div class="page">${page}</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -419,6 +419,7 @@ $(function(){
            }
        },
        submitHandler: function(form){
+    	   loading('<spring:message code="onloading"/>');
     	   form.submit();
        }
    });
@@ -428,6 +429,9 @@ $(function(){
 	  $(this).val(ns);
    });*/
    $("input[name*='userRegion']").addClass("invisibleChar");
+   $("#cancel").on("click",function(){
+		window.history.back();
+   });
 });
 window.onload=function(){
 	//日志查询IP类型增加格式提示