From dfb5f8499fd11c5245414ca0902971b7b67e7347 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 25 May 2018 16:01:01 +0800
Subject: [PATCH] =?UTF-8?q?(1)IP=E7=B1=BB=E9=85=8D=E7=BD=AE=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AEID=20(2)IP=E7=99=BD=E5=90=8D=E5=8D=95IP/?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=BB=98=E8=AE=A4=E5=80=BC=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/controller/BaseController.java    |  9 +++++++++
 .../configuration/ntc/WhiteListController.java         |  1 +
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp | 10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index b2e5a5cdf..9592935bb 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -322,6 +322,15 @@ public class BaseController {
 		model.addAttribute("regionList", regionList);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
+		//ip配置设置protocolId
+		if(cfg instanceof BaseIpCfg){
+			for(FunctionServiceDict dict:serviceList){
+				if(cfg.getFunctionId().intValue()==dict.getFunctionId().intValue()){
+					((BaseIpCfg) cfg).setProtocolId(dict.getProtocolId().intValue());
+					break;
+				}
+			}
+		}
 	}
 	protected void initUpdateFormCondition(Model model,BaseCfg cfg){
 		//查询配置对应的地域ip
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index 6b1c57367..e22b26477 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -64,6 +64,7 @@ public class WhiteListController extends BaseController{
 			IpPortCfg cfg=new IpPortCfg();
 			cfg.initDefaultValueImpl();
 			cfg.setFunctionId(entity.getFunctionId());
+			cfg.setProtocolId(entity.getProtocolId());
 			model.addAttribute("_cfg", cfg);
 		}
 		
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 222be2629..a036af3d9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -5,7 +5,7 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	switchIpType($("select[name$='ipType']"));
+	switchIpInfo($("select[name$='ipType']"),"ipType");
 	$("input[name='isAreaEffective']").on('change',function(){
 		var val=$(this).val();
 		if(val==1){
@@ -40,7 +40,13 @@ $(function(){
 		window.history.back();
 	});
 	$("select[name$='ipType']").on("change",function(){
-		switchIpType($(this));
+		switchIpInfo(this,"ipType");
+	}); 
+	$("select[name$='ipPattern']").on("change",function(){
+		switchIpInfo(this,"ipPattern");
+	}); 
+	$("select[name$='portPattern']").on("change",function(){
+		switchIpInfo(this,"portPattern");
 	}); 
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));