(1)asn导入加入组织国家，asn号验证，组织国家不能为空，asn号不能为两个组织所有

(2)新增asn_keyword_cfg表，用于保存并下发有效且含审核通过asn ip的 asn号
(3)asn 导入去除条数限制
(4)页面asn select选项还是会影响加载页面速度，现在改为input
(5)asn_group_info 修改org_group_id为issued_ips，用于保存审核通过的asn ip
(6)分组复用url配置文件补全v1

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

@@ -1344,6 +1344,7 @@ public class BaseController {
 							BlockingQueue<P2pIpTemplate> list = ei.getDataList(P2pIpTemplate.class );
 							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list);
 						} else if (regionDict.getFunctionId().equals(600)) {// ASN IP
+							ei.setHasImportLimit(false);
 							//加载asn缓存
 							//AsnCacheUtils.init(true);
 							//从数据库中读取

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

@@ -16,6 +16,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.basics.AsnGroupInfo;
+import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 /**
@@ -110,6 +112,14 @@ public class AsnGroupController extends BaseController {
 		}
 		return false;
 	}
+	@RequestMapping(value="ajaxGetAuditedIPAddress",method=RequestMethod.POST)
+	@ResponseBody
+	public boolean ajaxGetAuditedIPAddress(Model model,@RequestParam(required=true,value="asnIds")String asnIds){
+		if(StringUtils.isNotBlank(asnIds)) {
+			return asnGroupInfoService.checkIpAddrs(asnIds);
+		}
+		return false;
+	}
 	@RequestMapping(value="asnGroupName",method=RequestMethod.POST)
 	@ResponseBody
 	public Integer asnGroupName(Model model,@RequestParam(required=true,value="id")Long id,@RequestParam(required=true,value="organization")String organization,@RequestParam(required=true,value="country")String country,
@@ -154,4 +164,19 @@ public class AsnGroupController extends BaseController {
 		
 		return false;
 	}
+	/**
+	 * 校验asn号是否已存在
+	 */
+	@ResponseBody
+	@RequestMapping(value = {"/orgMustExists"})
+	public boolean orgMustExists(AsnIpCfg cfg, HttpServletRequest request, HttpServletResponse response){
+		cfg.setIsValid(1);
+		AsnIpCfg asnIpCfg=asnIpCfgService.getOne(cfg);
+		if(asnIpCfg == null){
+			return false;
+		}
+		
+		return true;
+	}
+	
 }

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

@@ -61,8 +61,8 @@ public class AsnIpController extends BaseController{
 			,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
 			,RedirectAttributes redirectAttributes){
 		initFormCondition(model,cfg);
-		List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
-		model.addAttribute("policyGroups", groupInfos);
+		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
+		//model.addAttribute("policyGroups", groupInfos);
 		model.addAttribute("_cfg", cfg);
 		return "/basics/asnIpCfgFormAdd";
 	}
@@ -72,8 +72,8 @@ public class AsnIpController extends BaseController{
 			,RedirectAttributes redirectAttributes){
 		cfg = asnIpCfgService.get(Long.parseLong(ids));
 		initUpdateFormCondition(model, cfg);
-		List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
-		model.addAttribute("policyGroups", groupInfos);
+		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
+		//model.addAttribute("policyGroups", groupInfos);
 		model.addAttribute("_cfg", cfg);
 		return "/basics/asnIpCfgFormUpdate";
 	}
@@ -181,14 +181,14 @@ public class AsnIpController extends BaseController{
 		return "redirect:" + adminPath +"/basics/asn/list?functionId="+functionId;
 	}
 	
-	@RequestMapping(value = {"/ajaxDeleteAsnIp"})
+	/*@RequestMapping(value = {"/ajaxDeleteAsnIp"})
 	public void ajaxDeleteAsnIp(String ids, HttpServletRequest request, HttpServletResponse response){
 		try{
 			asnIpCfgService.ajaxDeleteAsnIp(ids);
 		}catch(Exception e){
 			logger.error("Delete failed",e);
 		}
-	}
+	}*/
 	@RequestMapping(value="ajaxGetGroups",method=RequestMethod.POST)
 	@ResponseBody
 	public List<AsnGroupInfo> ajaxGetGroups(Model model,@RequestParam(required=true,value="org")String org){

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

@@ -26,6 +26,7 @@ import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.AsnGroupInfo;
+import com.nis.domain.configuration.AsnKeywordCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
@@ -93,8 +94,8 @@ public class IpController extends BaseController{
 		}else{
 			initFormCondition(model,entity);
 		}
-		List<ConfigGroupInfo> policyGroups=asnPolicyCfgService.getConfigGroupInfoList(4);
-		model.addAttribute("policyGroups", policyGroups);
+		//List<ConfigGroupInfo> policyGroups=asnPolicyCfgService.getConfigGroupInfoList(4);
+		//model.addAttribute("policyGroups", policyGroups);
 		model.addAttribute("_cfg", entity);
 		return "/cfg/ipaddr/ipForm";
 	}
@@ -127,8 +128,14 @@ public class IpController extends BaseController{
 				}
 			}
 		}
-		if(StringUtils.isNotBlank(cfg.getUserRegion4())) {
-			tabList.add(new String[]{"3","ASN"});
+		if(cfg.getAsnKeywords()!=null){
+			String cfgType = null;
+			for(AsnKeywordCfg keyword:cfg.getAsnKeywords()){
+				if(!keyword.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"3",keyword.getCfgType()});
+					cfgType = keyword.getCfgType();
+				}
+			}
 		}
 		model.addAttribute("_cfg", cfg);	
 		model.addAttribute("index", index);
@@ -177,11 +184,11 @@ public class IpController extends BaseController{
 				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
 				try {
-					if(StringUtils.isNoneBlank(entity.getUserRegion4())) {
+					/*if(StringUtils.isNoneBlank(entity.getUserRegion4())) {
 						ipCfgService.auditAsnCfg(entity, isAudit);
-					}else {
+					}else {*/
 						ipCfgService.auditIpCfg(entity,isAudit);
-					}
+					/*}*/
 					addMessage(redirectAttributes,"success", "audit_success");
 				} catch (Exception e) {
 					logger.info("ip配置下发失败："+e.getMessage());
@@ -524,13 +531,13 @@ public class IpController extends BaseController{
 					titleList.add("asn_policy");
 					classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
 					classMap.put("NTC_IP", IpPortCfg.class);
-					classMap.put("asn_policy", AsnGroupInfo.class);
+					classMap.put("asn_policy", AsnKeywordCfg.class);
 					String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion3,userregion4,userregion5,&userregion2:ratelimit-";
 					String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 											+ ",config_time,editor,edit_time,auditor,audit_time"
 											+",letter,whether_area_block,classification,attribute,label"
 											+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
-					String asnGroupInfoNoExport=ipPortInfoNoExport+"block_type,";
+					String asnGroupInfoNoExport=ipPortInfoNoExport+"block_type,block_type,expression_type,match_method,is_hex,is_case_insenstive,";
 					// 时间过滤
 					if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {
 						cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
@@ -548,13 +555,11 @@ public class IpController extends BaseController{
 					noExportMap.put("NTC_IP", ipPortInfoNoExport);
 					noExportMap.put("asn_policy", asnGroupInfoNoExport);
 					List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
-					List<AsnGroupInfo> groupInfoList=new ArrayList<AsnGroupInfo>();
+					List<AsnKeywordCfg> groupInfoList=new ArrayList<AsnKeywordCfg>();
 					for (CfgIndexInfo cfg : ipLists) {
 						CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg);
 						ipList.addAll(cfgIndexInfo.getIpPortList());
-						if(!StringUtil.isEmpty(cfgIndexInfo.getUserRegion4())){
-							groupInfoList.addAll(cfgIndexInfo.getAsnGroups());
-						}
+						groupInfoList.addAll(cfgIndexInfo.getAsnKeywords());
 					}
 					dataMap.put(entity.getMenuNameCode(), ipLists);
 					dataMap.put("NTC_IP", ipList);