asnip导入模板增加

intercept ip monitor 协议tcp
			 whitelist 协议tcp(默认) udp

src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java

@@ -0,0 +1,33 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入ASN IP类配置
+ */
+public class AsnIpTemplate {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private String cfgDesc;
+	private String destIpAddress; 
+	
+	@ExcelField(title="config_describe",align=2,sort=1)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="server_ip",align=2,sort=12)
+	public String getDestIpAddress() {
+		return destIpAddress;
+	}
+	public void setDestIpAddress(String destIpAddress) {
+		this.destIpAddress = destIpAddress;
+	}
+}

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -47,6 +47,7 @@ import com.google.common.collect.Lists;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.SysDataDictionaryItem;
+import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.util.Constants;
@@ -55,6 +56,7 @@ import com.nis.util.Encodes;
 import com.nis.util.Reflections;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.FunctionServiceDictDao;
+import com.nis.web.dao.basics.PolicyGroupInfoDao;
 import com.nis.web.dao.configuration.DnsResStrategyDao;
 import com.nis.web.service.SpringContextHolder;
 import com.nis.web.service.configuration.DnsResStrategyService;
@@ -72,6 +74,7 @@ public class ExportExcel {
 	private static Logger log = LoggerFactory.getLogger(ExportExcel.class);
 	
 	private static DnsResStrategyDao dnsResStrategyDao = SpringContextHolder.getBean(DnsResStrategyDao.class);
+	private static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class);
 			
 	/**
 	 * 工作薄对象
@@ -262,7 +265,6 @@ public class ExportExcel {
 				index++;
 			}
 		}
-		
 		if(region.getRegionType().equals(1)){//IP配置
 			//ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction
 			//确定需要导入的srcIp srcPort destIp destPort信息
@@ -513,7 +515,7 @@ public class ExportExcel {
 			} 
 			//导入的Protocol
 			if("protocol".equals(headerStr)){
-				if(service.getFunctionId().equals(5) ){
+				if(region.getFunctionId().equals(5) ){
 					commentStr="";
 					//ip block tcp
 					if(service.getAction().equals(16) ){

src/main/java/com/nis/web/controller/BaseController.java

@@ -53,6 +53,7 @@ import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.domain.configuration.StringCfgTemplate;
+import com.nis.domain.configuration.template.AsnIpTemplate;
 import com.nis.domain.configuration.template.ComplexStringAllTemplate;
 import com.nis.domain.configuration.template.DnsComplexStringTemplate;
 import com.nis.domain.configuration.template.IpAllTemplate;
@@ -2949,6 +2950,9 @@ public class BaseController {
 					}else if(regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())){ //P2p IP
 						List<P2pIpTemplate> list = ei.getDataList(P2pIpTemplate.class,this.getMsgProp());
 						ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
+					}else if(regionDict.getFunctionId().equals(600)) {
+						List<AsnIpTemplate> list = ei.getDataList(AsnIpTemplate.class,this.getMsgProp());
+						ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
 					}else {
 						List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class,this.getMsgProp());
 						ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);

src/main/java/com/nis/web/controller/basics/AsnIpController.java

@@ -16,11 +16,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.DictUtils;
 import com.nis.web.controller.BaseController;
 @Controller
 @RequestMapping(value = "${adminPath}/basics/asn")
@@ -32,6 +35,11 @@ public class AsnIpController extends BaseController{
 		Page<AsnIpCfg> page = asnIpCfgService.findPage(new Page<AsnIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
 		initPageCondition(model);
+		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
+		model.addAttribute("regionList", regionList);
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
 		model.addAttribute("policyGroups", policyGroups);
 		return "/basics/asnIpCfgList";

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

@@ -28,6 +28,7 @@ import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
+import com.nis.domain.configuration.template.AsnIpTemplate;
 import com.nis.domain.configuration.template.ComplexStringAllTemplate;
 import com.nis.domain.configuration.template.DnsComplexStringTemplate;
 import com.nis.domain.configuration.template.DnsIpTemplate;
@@ -270,6 +271,11 @@ public class IpController extends BaseController{
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, P2pIpTemplate.class, 2);
 				excel.setDataList(this.getMsgProp(),classList,null).
 		    	write(request,response, fileName).dispose();
+			}else if(regionDict.getFunctionId().equals(600)){ //asnip
+				List<AsnIpTemplate> classList=new ArrayList<AsnIpTemplate>();
+				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AsnIpTemplate.class, 2);
+				excel.setDataList(this.getMsgProp(),classList,null).
+		    	write(request,response, fileName).dispose();
 			}else{
 				List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);