From 09c704ccf7cad107c0202d0ec29c1890ca37f0f8 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 1 Aug 2018 15:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=AF=B9drop=20action=E7=9A=84ICMP=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java  | 8 +++++++-
 .../web/controller/configuration/ntc/IpController.java    | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 7a7c6c484..dc18ac3f1 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -686,12 +686,19 @@ public class BaseController {
 		List<SysDataDictionaryItem>  ipsecProrocolList = DictUtils.getDictList("IPSEC_PROTOCOL");
 		List<SysDataDictionaryItem>  tunnelProrocolList = DictUtils.getDictList("TUNNEL_PROTOCOL");
 		List<SysDataDictionaryItem>  specialFunctionIdList = DictUtils.getDictList("SPECIAL_FUNCTION_ID");
+		List<SysDataDictionaryItem>  irTypeList = DictUtils.getDictList("IR_TYPE");
 		String specialItem=null;
 		for(SysDataDictionaryItem sfuncItem:specialFunctionIdList){
 			if(functionId==Integer.parseInt(sfuncItem.getItemCode())){
 				specialItem=sfuncItem.getItemValue();
 			}
 		}
+		if("ipaddr".equals(specialItem)){
+			List<SysDataDictionaryItem>  icmpprotocolList = DictUtils.getDictList("ICMP_PROTOCOL");
+			if(action==Constants.DROP_ACTION) {
+				protocolList.addAll(icmpprotocolList);
+			}
+		}
 		StringBuffer msg=new StringBuffer();
 		int line=1;
 		for(IpCfgTemplate value:list){
@@ -1000,7 +1007,6 @@ public class BaseController {
 			}
 			//group and ir_type check start
 			if("ipmulitiplex".equals(specialItem)) {
-				List<SysDataDictionaryItem>  irTypeList = DictUtils.getDictList("IR_TYPE");
 				Integer irType=	value.getIrType();
 				if(irType==null) {
 					errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ir_type"))+";");
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
index 1f0324f83..7bd3a945d 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
@@ -104,6 +104,10 @@ public class IpController extends CommonController{
 				this._importIp(cfgName,redirectAttributes, file,cfg,TunnelIpTemplate.class);
 		}else if("ipsec".equals(specialFunctionId)) {
 			this._importIp(cfgName,redirectAttributes, file,cfg,IpsecTemplate.class);
+		}else if("ipaddr".equals(specialFunctionId)) {
+			this._importIp(cfgName,redirectAttributes, file,cfg,IpAddrTemplate.class);
+		}else {
+			this._importIp(cfgName,redirectAttributes, file,cfg);
 		}
 		
 		
@@ -127,6 +131,10 @@ public class IpController extends CommonController{
 			this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,TunnelIpTemplate.class);
 		}else if("ipsec".equals(specialFunctionId)) {
 			this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpsecTemplate.class);
+		}else if("ipaddr".equals(specialFunctionId)) {
+			this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpAddrTemplate.class);
+		}else {
+			this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
 		}
 	}
 	//ip配置导出