IP复用地址池配置

拆分为两个子菜单：SNAT地址池管理和DNAT地址池管理

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

@@ -27,7 +27,7 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
 	private Integer protocol;
 	@Expose
 	@SerializedName("ip")
-	private String srcIpAddress;
+	private String destIpAddress;
 	@Expose
 	private String port;
 	@Expose
@@ -58,11 +58,12 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
 		this.protocol = protocol;
 	}
 	
-	public String getSrcIpAddress() {
-		return srcIpAddress;
+
+	public String getDestIpAddress() {
+		return destIpAddress;
 	}
-	public void setSrcIpAddress(String srcIpAddress) {
-		this.srcIpAddress = srcIpAddress;
+	public void setDestIpAddress(String destIpAddress) {
+		this.destIpAddress = destIpAddress;
 	}
 	public String getPort() {
 		return port;

src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java

@@ -47,9 +47,8 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		}
 		
 		//查询ip复用地址池配置的policyGroup列表
-		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2);
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(3);
 		model.addAttribute("policyGroups", policyGroups);
-		
 		model.addAttribute("_cfg", cfg);
 		return "/cfg/maintenance/ipMultiplexPool/form";
 	}
@@ -92,7 +91,6 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		}catch(Exception e){
 			addMessage(redirectAttributes,"delete_failed");
 		}
-		
 		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId;
 	}
 	
@@ -125,4 +123,89 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 			return true;
 		}
 	}
+	
+	@RequestMapping(value = {"/snatlist"})
+	public String snatlist(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")IpMultiplexPoolCfg entity){
+		//查询时left join policyGroup
+		Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model,entity);
+		return "/cfg/maintenance/ipMultiplexPool/snatlist";
+	}
+	
+	@RequestMapping(value = {"/snatform"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:config"})
+	public String snatfrom(Model model,
+							HttpServletRequest request,
+							HttpServletResponse response,
+							String ids,
+							@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
+		if(cfg == null){
+			cfg=new IpMultiplexPoolCfg();
+		}
+		if(!StringUtil.isEmpty(ids)){
+			cfg = ipMultiplexPoolCfgService.getIpMultiplexPoolCfg(Long.valueOf(ids),null);
+			initFormCondition(model, cfg);
+		}else{
+			initFormCondition(model, cfg);
+		}
+		
+		//查询ip复用地址池配置的policyGroup列表
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2);
+		model.addAttribute("policyGroups", policyGroups);
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/maintenance/ipMultiplexPool/snatform";
+	}
+	
+	@RequestMapping(value = {"/snatsaveOrUpdate"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:config"})
+	public String snatsaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
+			@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
+		try{
+			
+			ipMultiplexPoolCfgService.saveOrUpdate(cfg);
+			
+			addMessage(redirectAttributes,"save_success");
+		}catch(Exception e){
+			e.printStackTrace();
+			addMessage(redirectAttributes,"save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/snataudit"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:confirm"})
+	public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				try {
+					ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("SNAT地址池管理配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
+			}
+			
+		}
+		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
+	}
+	@RequestMapping(value = {"/snatdelete"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:config"})
+	public String snatdelete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,RedirectAttributes redirectAttributes
+			,HttpServletRequest request,HttpServletResponse response){
+		try{
+			if(!StringUtil.isEmpty(ids)){
+				ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
+			}
+			addMessage(redirectAttributes,"delete_success");
+		}catch(Exception e){
+			addMessage(redirectAttributes,"delete_failed");
+		}
+		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
+	}
+	
 }

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

@@ -7,7 +7,7 @@
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
 	    <result column="protocol" property="protocol" jdbcType="INTEGER" />
-	    <result column="ip" property="srcIpAddress" jdbcType="VARCHAR" />
+	    <result column="ip" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="port" property="port" jdbcType="VARCHAR" />
 	    <result column="direction" property="direction" jdbcType="INTEGER" />
 	    <result column="user_region" property="userRegion" jdbcType="VARCHAR" />
@@ -72,8 +72,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="srcIpAddress != null and srcIpAddress != ''">
-	    		AND r.ip like concat(concat('%',#{srcIpAddress,jdbcType=VARCHAR}),'%') 
+	    	<if test="destIpAddress != null and destIpAddress != ''">
+	    		AND r.ip like concat(concat('%',#{destIpAddress,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="groupName != null and groupName != ''">
 	    		AND a.group_name like concat(concat('%',#{groupName,jdbcType=VARCHAR}),'%') 
@@ -204,7 +204,7 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{protocol,jdbcType=INTEGER},
-    	#{srcIpAddress,jdbcType=VARCHAR},
+    	#{destIpAddress,jdbcType=VARCHAR},
     	#{port,jdbcType=VARCHAR},
     	#{direction,jdbcType=INTEGER},
     	#{userRegion,jdbcType=VARCHAR},
@@ -277,8 +277,8 @@
       <if test="protocol != null" >
         protocol = #{protocol,jdbcType=INTEGER},
       </if>
-      <if test="srcIpAddress != null and srcIpAddress!=''" >
-        ip = #{srcIpAddress,jdbcType=VARCHAR},
+      <if test="destIpAddress != null and destIpAddress!=''" >
+        ip = #{destIpAddress,jdbcType=VARCHAR},
       </if>
       <if test="port != null and port!=''" >
         port = #{port,jdbcType=VARCHAR},

src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp

@@ -134,9 +134,10 @@
 	<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">
+	<%-- 	<h3 class="page-title">
 			<spring:message code="mail_control"></spring:message>
-		</h3>
+		</h3> --%>
+		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="mail_note"></spring:message></span>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp

@@ -5,8 +5,8 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("select[name='protocol']").parents(".form-group").addClass("hidden");
-	$("select[name='direction']").parents(".form-group").addClass("hidden");
+	/* $("select[name='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name='direction']").parents(".form-group").addClass("hidden"); */
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
@@ -32,9 +32,9 @@ $(function(){
 <body>
 
 <div class="page-content">
-	<h3 class="page-title">
-   		<spring:message code="ip_multiplex_pool_config"></spring:message>
-	</h3>
+<%-- 	<h3 class="page-title">
+   		<spring:message code="snat_multiplex"></spring:message>
+	</h3> --%>
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
@@ -87,8 +87,8 @@ $(function(){
 								            <div class="col-md-6">
 								            	<select name="policyGroup" class="selectpicker show-tick form-control required">
 													<option value="" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
-					               					<c:forEach items="${policyGroups }" var="policyGroup">
-														<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+					               					<c:forEach items="${policyGroups}" var="policyGroup">
+					               							<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
 								                </select>
 								            </div>
@@ -123,7 +123,7 @@ $(function(){
 								</div>
 								<div class="row ipInfo">
 									<div class="row">
-									    <div class="col-md-6">
+									    <div class="col-md-6 hidden" >
 									        <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">
@@ -137,46 +137,6 @@ $(function(){
 											    <div for="ipType"></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="ip" /></label>
-												<div class="col-md-6">
-													<input class="form-control required ipCheck" type="text"
-														name="srcIpAddress"
-														value="${_cfg.srcIpAddress}">
-												</div>
-												<div for="srcIpAddress"></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="port"/></label>
-									            <div class="col-md-6">
-									               <input class="form-control required digits" name="port" range="[0,65535]" type="text" value="${_cfg.port }">
-									            </div>
-											    <div for="port"></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="direction"
-															class="selectpicker show-tick form-control required">
-															<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-																<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
-															</c:forEach>
-														</select>
-													</div>
-												<div for="direction"></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="protocol"/></label>
@@ -191,9 +151,48 @@ $(function(){
 											    <div for="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="server_ip" /></label>
+												<div class="col-md-6">
+													<input class="form-control required ipCheck" type="text"
+														name="destIpAddress"
+														value="${_cfg.destIpAddress}">
+												</div>
+												<div for="destIpAddress"></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="server_port"/></label>
+									            <div class="col-md-6">
+									               <input class="form-control required digits" name="port" range="[0,65535]" type="text" value="${_cfg.port}">
+									            </div>
+											    <div for="port"></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="direction"
+															class="selectpicker show-tick form-control required">
+															<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+																<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==1)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+															</c:forEach>
+														</select>
+													</div>
+												<div for="direction"></div>
+											</div>
+										</div>
+									</div>
+									 
 							</div>
-							<div class="row">
+							<div class="row  hidden">
 								<div class="col-md-6">
 									<div class="form-group ">
 										<label class="control-label col-md-3"><font color="red">*</font>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp

@@ -10,8 +10,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.groupName}"){
 			$("#intype").val("${cfg.groupName}");
-		}else if("${cfg.srcIpAddress}"){
-			$("#intype").val("${cfg.srcIpAddress}");
+		}else if("${cfg.destIpAddress}"){
+			$("#intype").val("${cfg.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -50,7 +50,7 @@
 	</div>
 
 	<h3 class="page-title">
-   		<spring:message code="ip_multiplex_pool_config"></spring:message>
+   		<spring:message code="dnat_multiplex"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -87,7 +87,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
+												<form:option value="destIpAddress"><spring:message code="ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
@@ -146,9 +146,7 @@
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<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='letter'/></label>
 	                                            <c:set var="select"><spring:message code='select'/></c:set>
@@ -278,12 +276,12 @@
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="group"/></th>
-									<th><spring:message code="ip"/></th>
-									<th><spring:message code="port"/></th>
-									<%-- <th><spring:message code="protocol"/></th>
-									<th><spring:message code="direction"/></th> --%>
-									<th><spring:message code="location"/></th>
-									<th><spring:message code="ip_type"/></th>
+									<th><spring:message code="server_ip"/></th>
+									<th><spring:message code="server_port"/></th>
+									 <th><spring:message code="protocol"/></th>
+									<th><spring:message code="direction"/></th> 
+									<%-- <th><spring:message code="location"/></th>
+									<th><spring:message code="ip_type"/></th> --%>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="letter"/></th>
@@ -317,9 +315,9 @@
 											${fns:abbr(cfg.groupName,20)}
 										</a>
 									</td>
-									<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
+									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
 									<td>${cfg.port }</td>
-									<%-- <td>
+									 <td>
 										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
 											<c:if test="${cfg.protocol==protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 										</c:forEach>
@@ -328,8 +326,8 @@
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
 											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
 										</c:forEach>
-									</td> --%>
-									<td>
+									</td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
 											<c:if test="${cfg.location eq locationC.itemCode}"><spring:message code="${locationC.itemValue }"/></c:if>
 										</c:forEach>
@@ -338,7 +336,7 @@
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp

@@ -0,0 +1,236 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script type="text/javascript">
+$(function(){
+	/* $("select[name='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name='direction']").parents(".form-group").addClass("hidden"); */
+	$(".action").on("change", function() {
+		$("#serviceId").val($(this).attr("serviceId"));
+	});
+	$("#serviceId").val($(".action:checked").attr("serviceId"));
+	$("#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){
+			loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox"
+	});
+});
+
+</script>
+</head>
+<body>
+
+<div class="page-content">
+<%-- 	<h3 class="page-title">
+   		<spring:message code="snat_multiplex"></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}"><spring:message code="edit"></spring:message></c:if>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/maintenance/ipMultiplexPoolCfg/snatsaveOrUpdate" method="post" class="form-horizontal">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                       	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                       	<input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}">
+                       	<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode"
+                   				 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+                   				 value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                          <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 for="cfgDesc"></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="group"/></label>
+								            <div class="col-md-6">
+								            	<select name="policyGroup" class="selectpicker show-tick form-control required">
+													<option value="" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
+					               					<c:forEach items="${policyGroups }" var="policyGroup">
+					               							<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+							              			</c:forEach>
+								                </select>
+								            </div>
+								              <div for="policyGroup"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6 hidden">
+								        <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>
+								<div class="row ipInfo">
+									<div class="row">
+									    <div class="col-md-6 hidden" >
+									        <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="ipType"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+															<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+									            </div>
+											    <div for="ipType"></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_ip" /></label>
+												<div class="col-md-6">
+													<input class="form-control required ipCheck" type="text"
+														name="destIpAddress"
+														value="${_cfg.destIpAddress}">
+												</div>
+												<div for="destIpAddress"></div>
+											</div>
+										</div>
+									</div>
+									<div class="row">
+									    <div class="col-md-6 hidden">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
+									            <div class="col-md-6">
+									               <input class="form-control required digits" name="port" range="[0,65535]" type="text" value="0">
+									            </div>
+											    <div for="port"></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="direction"
+															class="selectpicker show-tick form-control required">
+															<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+																<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==1)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+															</c:forEach>
+														</select>
+													</div>
+												<div for="direction"></div>
+											</div>
+										</div>
+									</div>
+									 <div class="row hidden">
+									     <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="protocol"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+															<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+									            </div>
+											    <div for="protocol"></div>
+									        </div>
+									    </div> 
+									</div>
+							</div>
+							<div class="row  hidden">
+								<div class="col-md-6">
+									<div class="form-group ">
+										<label class="control-label col-md-3"><font color="red">*</font>
+											<spring:message code="location" /></label>
+											<div class="col-md-6">
+												<select name="location"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
+														<option value="${locationC.itemCode}" <c:if test="${_cfg.location==locationC.itemCode || (_cfg.location==null && locationC.itemCode==0)}">selected</c:if>><spring:message code="${locationC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+										<div for="location"></div>
+									</div>
+								</div>
+							</div>
+                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                          </div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp

@@ -0,0 +1,442 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script>
+ 	$(document).ready(function() {
+ 		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.groupName}"){
+			$("#intype").val("${cfg.groupName}");
+		}else if("${cfg.destIpAddress}"){
+			$("#intype").val("${cfg.destIpAddress}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#description").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+ 	});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+			<shiro:hasPermission name="ip:mulitiplex:pool:config">
+				<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/maintenance/ipMultiplexPoolCfg/snatform?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="snat_multiplex"></spring:message>
+	</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}/maintenance/ipMultiplexPoolCfg/snatlist?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="destIpAddress"><spring:message code="ip"></spring:message></form:option>
+												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+											 <form:select path="isValid" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<form:option value="1"><spring:message code="yes"/></form:option>
+													<form:option value="0"><spring:message code="no"/></form:option>
+											 </form:select>
+										 </div>
+                                  
+                                    </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="ip:mulitiplex:pool:config">
+							 			<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatform" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatdelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                                    <shiro:hasPermission name="ip:mulitiplex:pool: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}/maintenance/ipMultiplexPoolCfg/snataudit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snataudit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snataudit?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='letter'/></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='classification'/></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>
+					<sys:message content="${message}"/>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<%-- <th><spring:message code="seq"/></th> --%>
+									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
+									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
+									<th><spring:message code="group"/></th>
+									<th><spring:message code="server_ip"/></th>
+									<%-- <th><spring:message code="port"/></th> --%>
+									<%-- <th><spring:message code="protocol"/></th>
+									<th><spring:message code="direction"/></th> --%>
+								<%-- 	<th><spring:message code="location"/></th>
+									<th><spring:message code="ip_type"/></th> --%>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="classification"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
+									<%-- <th><spring:message code="operation"></spring:message></th> --%>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
+									<tr>
+									<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId}</td>
+									<td>
+										<a href="javascript:;" data-original-title="${cfg.cfgDesc}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(cfg.cfgDesc,20)}
+										</a>
+									</td>
+									<td>
+										<a href="javascript:;" data-original-title="${cfg.groupName}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(cfg.groupName,20)}
+										</a>
+									</td>
+									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
+									<%-- <td>${cfg.port }</td> --%>
+									<%-- <td>
+										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+											<c:if test="${cfg.protocol==protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+										</c:forEach>
+									</td> --%>
+									<%-- <td>
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
+											<c:if test="${cfg.location eq locationC.itemCode}"><spring:message code="${locationC.itemValue }"/></c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
+										</c:forEach>
+									</td> --%>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+
+									<td>${cfg.requestName }</td>
+									<td >
+										<c:set var="classify"></c:set>
+										<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
+											<c:forEach items="${fls}" var="fl">
+												<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+												<c:if test="${status.index+1 eq 1}">
+													<c:set var="classify" value="${fl.itemValue}"></c:set>
+												</c:if>
+												<c:if test="${status.index+1 ne 1}">
+													<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+												</c:if>
+												</c:if>
+											</c:forEach>
+										</c:forEach>
+										<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(cfg.attribute,',')}" var="attributeId" varStatus="status">
+											<c:forEach items="${xzs}" var="xz">
+												<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+												<c:if test="${status.index+1 eq 1}">
+													<c:set var="attribute" value="${xz.itemValue}"></c:set>
+												</c:if>
+												<c:if test="${status.index+1 ne 1}">
+													<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+												</c:if>
+												</c:if>
+											</c:forEach>
+										</c:forEach>
+										<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(cfg.lable,',')}" var="lableId" varStatus="status">
+											<c:forEach items="${lables}" var="lable">
+												<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+												<c:if test="${status.index+1 eq 1}">
+													<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+												</c:if>
+												<c:if test="${status.index+1 ne 1}">
+													<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+												</c:if>
+												</c:if>
+											</c:forEach>
+										</c:forEach>
+										<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>${cfg.areaEffectiveIds }</td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									
+									<td>${cfg.creatorName }</td>
+									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.editorName }</td>
+									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.auditorName }</td>
+									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+					</div>
+				</div>
+			</div>
+</div>
+
+</body>
+</html>