ASN分组逻辑调整，配置使用ANS号对应组织的分组改为使用ANS号新增的唯一分组

(cherry picked from commit 5b49bf1d80)

src/main/java/com/nis/domain/basics/AsnGroupInfo.java

@@ -34,8 +34,14 @@ public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
 	private Integer regionId;
 	private Integer orgGroupId;
 	
+	private Integer onlyGroupId;// ip地址独用组id
 	
-	
+	public Integer getOnlyGroupId() {
+		return onlyGroupId;
+	}
+	public void setOnlyGroupId(Integer onlyGroupId) {
+		this.onlyGroupId = onlyGroupId;
+	}
 	public Integer getOrgGroupId() {
 		return orgGroupId;
 	}

src/main/java/com/nis/util/ConfigDictUtils.java

@@ -212,7 +212,7 @@ public class ConfigDictUtils {
 	 * @param compileId
 	 * @return
 	 */
-	public static List<Integer> getASNIPNum(Integer groupId ) {
+	public static List<Integer> getASNIPNum(Long groupId ) {
 		List<Integer> ipNum=new ArrayList<>();
 		try {
 			if(!StringUtil.isEmpty(groupId)){

src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java

@@ -37,5 +37,5 @@ public interface AsnGroupInfoDao extends CrudDao<AsnGroupInfo> {
 	void insertWithId(AsnGroupInfo asnGroupInfo);
 	void insertWithoutId(AsnGroupInfo asnGroupInfo);
 	void updateIpNum(@Param("v4Num")long v4Num,@Param("v6Num")long v6Num,@Param("groupId")Integer groupId);
-	List<Object[]> getASNIPNum(@Param("asnNo")Integer asnNo);
+	List<Object[]> getASNIPNum(@Param("asnNo")Long asnNo);
 }

src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml

@@ -21,7 +21,7 @@
   </resultMap>
     <sql id="AsnGroupInfoColumns">
 		r.id,r.group_id,r.compile_id,r.organization,r.country,r.detail,r.is_valid,r.create_time,r.edit_time,
-		r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id,r.org_group_id
+		r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id,r.org_group_id,r.only_group_id
 	</sql>
   
    <!-- 查出所有 有效数据-->
@@ -107,7 +107,8 @@
     asn_id,
     is_used,
     region_id,
-    org_group_id
+    org_group_id,
+    only_group_id
     )values (
     	#{groupId,jdbcType=INTEGER}, 
     	#{compileId,jdbcType=INTEGER}, 
@@ -122,7 +123,8 @@
     	#{asnId,jdbcType=INTEGER},
     	#{isUsed,jdbcType=INTEGER},
     	#{regionId,jdbcType=INTEGER},
-    	#{orgGroupId,jdbcType=INTEGER}
+    	#{orgGroupId,jdbcType=INTEGER},
+    	#{onlyGroupId,jdbcType=INTEGER}
     )
   </insert>
 <insert id="insertWithoutId" parameterType="com.nis.domain.basics.AsnGroupInfo" >
@@ -174,7 +176,8 @@
     asn_id,
     is_used,
     region_id,
-    org_group_id
+    org_group_id,
+    only_group_id
     )values (
     	#{id,jdbcType=INTEGER}, 
     	#{groupId,jdbcType=INTEGER}, 
@@ -190,7 +193,8 @@
     	#{asnId,jdbcType=INTEGER},
     	#{isUsed,jdbcType=INTEGER},
     	#{regionId,jdbcType=INTEGER},
-    	#{orgGroupId,jdbcType=INTEGER}
+    	#{orgGroupId,jdbcType=INTEGER},
+    	#{onlyGroupId,jdbcType=INTEGER}
     )
   </insert>
   <update id="update" parameterType="com.nis.domain.basics.AsnGroupInfo" >

src/main/java/com/nis/web/service/BaseService.java

@@ -3022,7 +3022,7 @@ public abstract class BaseService {
 				//<!-- 是否自动更新ASN NO -->
 				asnKeywordCfg.setUserRegion4(StringUtil.isEmpty(asnKeywordCfg.getUserRegion4()) ? "1":"0");
 				if("1".equals(asnKeywordCfg.getUserRegion4())){ //是否标记为下发ALL
-					signAuditAllGroupList.add(Integer.parseInt(asnKeywordCfg.getUserRegion4()));
+					signAuditAllGroupList.add(Integer.parseInt(asnKeywordCfg.getUserRegion3()));
 				}
 				groupWithRegion.put(asnKeywordCfg.getUserRegion2(), asnKeywordCfg.getUserRegion3());
 				//需要标记为is_used=1的组织
@@ -3107,6 +3107,169 @@ public abstract class BaseService {
 		}
 		
 		
+		/*if(asnList!=null && asnList.size()>0){
+			
+				for (AsnKeywordCfg asnKeywordCfg : asnList) {
+					asnNoStr+=asnKeywordCfg.getCfgKeywords()+",";
+				}
+				
+				AsnKeywordCfg cfg = new AsnKeywordCfg();
+				cfg.setTableName(AsnKeywordCfg.getTablename());
+				cfg.setCompileId(entity.getCompileId());
+				cfg.setIsAudit(entity.getIsAudit());
+				cfg.setIsValid(entity.getIsValid());
+				cfg.setAuditorId(entity.getAuditorId());
+				cfg.setAuditTime(entity.getAuditTime());
+				cfg.setFunctionId(entity.getFunctionId());
+				ipCfgDao.auditCfg(cfg);
+				Map<String,List> map = cfgConvert(strRegionList,asnList,7,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+		}
+		//修改配置选中的ASN NO 和 asn orga是否被策略引用过
+		if(!StringUtil.isEmpty(asnNoStr)){
+			asnNoStr=asnNoStr.substring(0, asnNoStr.length()-1);
+			if(!StringUtil.isEmpty(asnNoStr)){
+				//如果asnGroup由is_use=0，修改为is_use=1;查询asn no下所有未下发的asn ip，并进行下发，走POST接口【暂时不考虑】
+				AsnIpCfgDao asnIpCfgDao=SpringContextHolder.getBean(AsnIpCfgDao.class);
+				AsnIpCfg asnIp=new AsnIpCfg();
+				asnIp.setIsAudit(0);
+				asnIp.setIsValid(0);
+				List<AsnIpCfg> asnIpList=asnIpCfgDao.findAllListByAsnGroup(asnIp, null, asnNoStr);
+				
+				//下发asn IP和修改asn ip的状态必须在一个事物中
+				//重新修改下发时间，下发人员信息
+				AsnIpCfg auditAsnIpCfg=new AsnIpCfg();
+				auditAsnIpCfg.setIsAudit(1);
+				auditAsnIpCfg.setAuditTime(new Date());
+				auditAsnIpCfg.setAuditorId(UserUtils.getUser().getId());
+				auditAsnIpCfg.setIsValid(1);
+				auditAllAsnRegionCfg(auditAsnIpCfg, null, asnNoStr);
+				
+				AsnGroupInfoDao asnGroupInfoDao=SpringContextHolder.getBean(AsnGroupInfoDao.class);
+				asnGroupInfoDao.updateIsUsed(asnNoStr, 1);
+			}
+		}*/
+		
+	}
+	/**
+	 * ASN关键字配置处理 ip地址用
+	 * @param asnList
+	 * @param entity
+	 */
+	public void auditAsnCfgForIpAddr(List<GroupCfg> groupRelationList,List<StringCfg> strRegionList,BaseCfg entity,List<AsnKeywordCfg> asnList){
+		//注意：一条配置是一个分组，keywords=asnNos|userRegion1=groupId|userRegion2=isAuditAll  0 1
+		if(!StringUtil.isEmpty(asnList)){
+			AsnGroupInfoDao asnGroupInfoDao=SpringContextHolder.getBean(AsnGroupInfoDao.class);
+			ConfigGroupInfoDao configGroupInfoDao=SpringContextHolder.getBean(ConfigGroupInfoDao.class);
+			StringCfgDao stringCfgDao=SpringContextHolder.getBean(StringCfgDao.class);
+			//域和分组的关系
+			Map<String,String> groupWithRegion=new HashMap<>();
+			//需要标记为下发全部域的groupId集合
+			List signAuditAllGroupList=new ArrayList<>();
+			//需要标记下发的groupId
+			List isUsedGroupIdList=new ArrayList<>();
+			//所有已被策略引用过的域
+			List<AsnGroupInfo> auditRegionList=new ArrayList<>();
+			//所有未被策略过的域
+			List<AsnGroupInfo> notAuditRegionList=new ArrayList<>();
+			//所有策略所选asn No
+			List<String> asnGroupIdList=new ArrayList<>();
+			//所有未下发过的asnNo
+			List<String> notAuditGroupIdList=new ArrayList<>();
+			//最新的asn域集合
+			List<AsnKeywordCfg> newAsnList=new ArrayList<>();
+			
+			//2、记录标记为下发all的groupId|存储组和asnno的关系|记录需要标记为已下发的group
+			for (AsnKeywordCfg asnKeywordCfg : asnList) {
+				//<!-- 是否自动更新ASN NO -->
+				asnKeywordCfg.setUserRegion4(StringUtil.isEmpty(asnKeywordCfg.getUserRegion4()) ? "1":"0");
+				if("1".equals(asnKeywordCfg.getUserRegion4())){ //是否标记为下发ALL
+					signAuditAllGroupList.add(Integer.parseInt(asnKeywordCfg.getUserRegion3()));
+				}
+				groupWithRegion.put(asnKeywordCfg.getUserRegion2(), asnKeywordCfg.getUserRegion5()); //UserRegion5 ip地址使用组
+				//需要标记为is_used=1的组织
+				if(!isUsedGroupIdList.contains(Integer.parseInt(asnKeywordCfg.getUserRegion3()))){
+					isUsedGroupIdList.add(Integer.parseInt(asnKeywordCfg.getUserRegion3()));
+				}
+				//需要标记为is_used=1的asn no，根据groupId
+				asnGroupIdList.add(asnKeywordCfg.getUserRegion2());
+				
+				AsnKeywordCfg asnCfg=new AsnKeywordCfg();
+				BeanUtils.copyProperties(entity, asnCfg,new String[]{"cfgId","userReigon1","userReigon2","userReigon3","userReigon4","userReigon5"});
+				asnCfg.setTableName(AsnKeywordCfg.getTablename());
+				asnCfg.setCfgId(asnKeywordCfg.getCfgId());
+				asnCfg.setUserRegion1(asnKeywordCfg.getUserRegion1());
+				asnCfg.setUserRegion2(asnKeywordCfg.getUserRegion2());
+				asnCfg.setUserRegion3(asnKeywordCfg.getUserRegion3());
+				asnCfg.setUserRegion4(asnKeywordCfg.getUserRegion4());
+				asnCfg.setUserRegion5(asnKeywordCfg.getUserRegion5());
+				stringCfgDao.updateAsnKeyword(asnCfg);
+			}
+			//3、//根据asnGroupIdList查询所有下发过的ASN NO
+			if(!StringUtil.isEmpty(asnGroupIdList)){
+				auditRegionList=asnGroupInfoDao.findAsnGroupInfoByGroupIds(asnGroupIdList, 1);
+			}
+			//已下发过的asn groupId只需要下发组
+			if(!StringUtil.isEmpty(auditRegionList)){
+				for (AsnGroupInfo asnGroupInfo : auditRegionList) {
+					AsnKeywordCfg cfg = new AsnKeywordCfg();
+					cfg.setCompileId(entity.getCompileId());
+					cfg.setRegionId(asnGroupInfo.getRegionId());
+					cfg.setGroupId(Integer.parseInt(groupWithRegion.get(asnGroupInfo.getGroupId().toString()))); //组号
+					cfg.setUserRegion3("0"); //是否下发域
+					cfg.setIsAudit(entity.getIsAudit());
+					cfg.setIsValid(entity.getIsValid());
+					cfg.setAuditorId(entity.getAuditorId());
+					cfg.setAuditTime(entity.getAuditTime());
+					newAsnList.add(cfg);
+				}
+			}
+			
+			//4、查询所有未下发过的 ASN NO
+			if(!StringUtil.isEmpty(asnGroupIdList)){
+				notAuditRegionList=asnGroupInfoDao.findAsnGroupInfoByGroupIds(asnGroupIdList, 0);
+			}
+			
+			if(!StringUtil.isEmpty(notAuditRegionList)){
+				for (AsnGroupInfo asnGroupInfo : notAuditRegionList) {
+					AsnKeywordCfg cfg = new AsnKeywordCfg();
+					cfg.initDefaultValue();
+					cfg.setTableName(AsnKeywordCfg.getTablename());
+					cfg.setCompileId(entity.getCompileId());
+					cfg.setCfgType(asnList.get(0).getCfgType());
+					cfg.setCfgKeywords(asnGroupInfo.getAsnId().toString());//关键字
+					cfg.setGroupId(Integer.parseInt(groupWithRegion.get(asnGroupInfo.getGroupId().toString()))); //groupId
+					cfg.setRegionId(asnGroupInfo.getRegionId());//regionid
+					cfg.setUserRegion3("1"); //是否下发域
+					cfg.setIsAudit(entity.getIsAudit());
+					cfg.setIsValid(entity.getIsValid());
+					cfg.setAuditorId(entity.getAuditorId());
+					cfg.setAuditTime(entity.getAuditTime());
+					cfg.setFunctionId(entity.getFunctionId());
+					newAsnList.add(cfg);
+					notAuditGroupIdList.add(asnGroupInfo.getGroupId().toString());
+				}
+			}
+			//5、修改所有下发的asn为已下发
+			if(!StringUtil.isEmpty(notAuditGroupIdList)){
+				asnGroupInfoDao.updateIsUsedAndIsValid(notAuditGroupIdList,1,null);
+			}
+			//6、标记组已被策略标记为全部下发
+			if(!StringUtil.isEmpty(signAuditAllGroupList)){
+				configGroupInfoDao.updateIsAuditAll(4, 1,signAuditAllGroupList );
+			}
+			//7、标记组已被策略引用
+			if(!StringUtil.isEmpty(isUsedGroupIdList)){
+				configGroupInfoDao.updateIsUsed(4, 1, isUsedGroupIdList);
+			}
+			//8、maat配置转换
+			if(!StringUtil.isEmpty(newAsnList)){
+				Map<String,List> map = cfgConvert(strRegionList,newAsnList,7,entity,groupRelationList);
+			}
+		}
+		
+		
 		/*if(asnList!=null && asnList.size()>0){
 			
 				for (AsnKeywordCfg asnKeywordCfg : asnList) {

src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java

@@ -80,6 +80,7 @@ public class AsnGroupInfoService extends BaseService{
 		entity.setCountry(country);
 		
 		int groupId=0;
+		int onlyGroupId=0;//用于ip地址中下发配置组号
 		//新增
 		if(entity.getGroupId()==null){
 			
@@ -110,10 +111,18 @@ public class AsnGroupInfoService extends BaseService{
 			}else {
 				throw new MaatConvertException("Get asn group id failed");
 			}
+			//新增组号用于ip地址新增业务
+			List<Integer> onlyGroupIds= ConfigServiceUtil.getId(2,1);
+			if(onlyGroupIds.size()>0) {
+				onlyGroupId=onlyGroupIds.get(0).intValue();
+			}else {
+				throw new MaatConvertException("Get asn group id failed");
+			}
 			Date createTime=new Date();
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(createTime);
 			entity.setGroupId(groupId);
+			entity.setOnlyGroupId(onlyGroupId);
 			entity.setOrgGroupId(configGroupInfo.getGroupId());
 			entity.setIsValid(0);
 			//分组已被策略设定为下发全部域，则需要自动下发新增的asno
@@ -193,13 +202,15 @@ public class AsnGroupInfoService extends BaseService{
 		List srcList=new ArrayList<>();
 		AsnKeywordCfg cfg=new AsnKeywordCfg();
 		cfg.initDefaultValue();
-		cfg.setGroupId(group.getGroupId());
+//		cfg.setGroupId(group.getGroupId());
+		cfg.setGroupId(entity.getOnlyGroupId());// 用于ip地址 asn
 		cfg.setCfgKeywords(entity.getAsnId().toString());
 		cfg.setRegionId(entity.getRegionId());
 		cfg.setCfgType(Constants.NTC_ASN_NUMBER);
 		cfg.setAuditTime(new Date());
 		srcList.add(cfg);
-		srcMap.put(group.getGroupId(), srcList);
+//		srcMap.put(group.getGroupId(), srcList);
+		srcMap.put(entity.getOnlyGroupId(), srcList);// 用于ip地址 asn
 		GroupReuseAddBean commonGroupBean=new GroupReuseAddBean();
 		List<GroupReuseCfg> commonGroupList=new ArrayList<>();
 		commonGroupList=convertCommonRegion(srcMap,commonGroupList,1,2,4);

src/main/java/com/nis/web/service/basics/AsnIpCfgService.java

@@ -2,8 +2,6 @@ package com.nis.web.service.basics;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -19,12 +17,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.beust.jcommander.internal.Lists;
 import com.google.common.collect.Maps;
-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.basics.AsnIpCfg;
-import com.nis.domain.configuration.AsnKeywordCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.maat.GroupReuseAddBean;
@@ -38,9 +34,9 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.domain.specific.ConfigGroupInfo;
+import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.basics.AsnGroupInfoDao;
@@ -394,6 +390,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
             		List<Integer> compileIds=ConfigServiceUtil.getId(1, newAsnGroup.size());
                 	List<Integer> groupIds=ConfigServiceUtil.getId(2, newAsnGroup.size());
                 	List<Integer> regionIds=ConfigServiceUtil.getId(3, newAsnGroup.size());
+            		int onlyGroupId=0;//用于ip地址中下发配置组号
                 	for(Entry<Long, AsnGroupInfo> e:newAsnGroup.entrySet()) {
                 		AsnGroupInfo asnGroupInfo=e.getValue();
                 		asnGroupInfo.setAsnId(e.getKey());
@@ -405,6 +402,14 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
                 		asnGroupInfo.setCompileId(compileIds.get(index));
                 		asnGroupInfo.setRegionId(regionIds.get(index));
                 		asnGroupInfo.setOrgGroupId(asnOrgList.get(1).get(asnGroupInfo.getOrganization()).getGroupId());
+                		//新增组号用于ip地址新增业务
+            			List<Integer> onlyGroupIds= ConfigServiceUtil.getId(2,1);
+            			if(onlyGroupIds.size()>0) {
+            				onlyGroupId=onlyGroupIds.get(0).intValue();
+            			}else {
+            				throw new MaatConvertException("Get asn group id failed");
+            			}
+                		asnGroupInfo.setOnlyGroupId(onlyGroupId);
                 		asnNoMaps.get(0).put(e.getKey(), asnGroupInfo);//设置完各种id后更新map数据
                 		asnNoMaps.get(2).put(e.getKey(), asnGroupInfo);//设置完各种id后更新map数据
                 		((AsnGroupInfoDao) batchSqlSession.getMapper(AsnGroupInfoDao.class)).insertWithId(asnGroupInfo);

src/main/java/com/nis/web/service/configuration/AppCfgService.java

@@ -372,6 +372,7 @@ public class AppCfgService extends BaseService {
 				configGroupInfo.setGroupId(specificServiceCfg.getGroupId());
 				configGroupInfo.setGroupName(specificServiceCfg.getSpecServiceName());
 				configGroupInfo.setIsIssued(0);
+				configGroupInfo.setInsertTime(new Date());
 				configGroupInfo.setGroupType(1);
 				configGroupInfo.setCompileId(compileId);
 				configGroupInfoDao.insertConfigGroupInfo(configGroupInfo);

src/main/java/com/nis/web/service/configuration/IpCfgService.java

@@ -560,7 +560,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			}
 		}
 		//asn配置下发
-		auditAsnCfg(groupRelationList,strRegionList,entity,entity.getAsnKeywords());
+		auditAsnCfgForIpAddr(groupRelationList,strRegionList,entity,entity.getAsnKeywords());
 		//保存区域IP信息
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		if(!StringUtil.isEmpty(areaIpCfgList)){

src/main/resources/sql/20190215/alter_asn_group_info.sql

@@ -0,0 +1 @@
+ALTER TABLE asn_group_info ADD  only_group_id int(11) DEFAULT NULL COMMENT '用于ip地址下发业务';

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -419,7 +419,7 @@
     <description>根据asnGroupId获取asn 的v4数量和v6数量</description>
     <name>getASNIPNum</name>
     <function-class>com.nis.util.ConfigDictUtils</function-class>
-    <function-signature>java.util.List getASNIPNum(java.lang.Integer)</function-signature>
+    <function-signature>java.util.List getASNIPNum(java.lang.Long)</function-signature>
     <example>${fns:getASNIPNum(str)}</example>
   </function>
 </taglib>

src/main/webapp/WEB-INF/views/cfg/asnForm.jsp

@@ -26,6 +26,8 @@
 <input type="hidden" name="${cfgName}.userRegion2" value="">
 <!-- asn no组织的groupId 【界面每次校验的时候填写】-->
 <input type="hidden" name="${cfgName}.userRegion3" value="">
+<!--ip地址 asn no组号的groupId -->
+<input type="hidden" name="${cfgName}.userRegion5" value="">
 <!-- 是否自动更新ASN NO -->
 <input type="hidden" name="${cfgName}.userRegion4" value="${cfg.userRegion4}">
 <%-- <div class="hidden" id="selectAll"><spring:message code="select_All_Text"/></div>

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js

@@ -965,6 +965,7 @@ jQuery.validator.addMethod("asnNoUnique",function(value, element) {
 			if(textStatus=="success"){
 				if(data == null || data.id==null || data.id == 'undefined'){
 					result=true;
+					
 				}else{
 					/*if($(element).attr("name") 
 							&& $(element).attr("name") != ''){
@@ -977,6 +978,7 @@ jQuery.validator.addMethod("asnNoUnique",function(value, element) {
 					}*/
 					result=false;
 				}
+				console.log(result)
 			}
 
 		}
@@ -1007,6 +1009,7 @@ jQuery.validator.addMethod("asnMustExists",function(value, element) {
 							$("input[name='"+name[0]+".userRegion1']").val(data.regionId);
 							$("input[name='"+name[0]+".userRegion2']").val(data.groupId);
 							$("input[name='"+name[0]+".userRegion3']").val(data.commonGroupIds);
+							$("input[name='"+name[0]+".userRegion5']").val(data.onlyGroupId);
 							var commonGroupIds=$("input[name='commonGroupIds']").val();
 							if(commonGroupIds !=null 
 									&& commonGroupIds != ''