From 606b8a755043ec5e74932281495148903b19a1fe Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 29 Nov 2018 15:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0app=20ip=E7=89=B9=E5=BE=81?=
 =?UTF-8?q?=EF=BC=88=E5=88=86=E7=BB=84=E5=A4=8D=E7=94=A8=EF=BC=89=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=90=E4=BA=A4=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationDao.java             |   1 +
 .../ConfigSynchronizationDao.xml              |  31 +++-
 .../ConfigSynchronizationService.java         | 161 +++++++++++++++---
 src/main/resources/service/service_config.xml |   3 +
 4 files changed, 168 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
index e8f1301b2..1d39c6b20 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
@@ -89,4 +89,5 @@ public interface ConfigSynchronizationDao {
 	public List<BaseStringCfg> getStrListByService(BaseCfg entity);
 	public List<ComplexkeywordCfg> getComplexStrListByService(BaseCfg entity);
 	public List<IpPortCfg> getAppIpPortList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
+	public List<AppIpCfg> getAppIpFeatureList(BaseCfg entity);
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
index 8d5abd9d9..fe765303a 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
@@ -1278,7 +1278,7 @@
 	a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
 	a.user_region3,a.user_region4,a.user_region5,
 	<choose>
-		<when test="serviceId==1026">
+		<when test="serviceId==1026 or serviceId==1152">
 			a.domain as cfg_keywords,
 		</when>
 		<otherwise>
@@ -1341,6 +1341,35 @@
 	    </trim>
 		ORDER BY a.CFG_ID
   </select>
+  <select id="getAppIpFeatureList" resultType="com.nis.domain.configuration.AppIpCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 select 
+		 	a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
+	a.service_id,a.request_id,a.is_area_effective,a.classify,a.attribute,a.lable,
+	a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
+	a.user_region3,a.user_region4,a.user_region5,
+    		<include refid="AppIpCfg_Column"></include>
+    		 <trim prefix="," prefixOverrides=",">
+				,s.name as creator_name,u.name as auditor_name
+	     		,a.app_code,a.spec_service_id,a.behav_code
+			</trim>
+    	from ${tableName} a
+    	left join sys_user s on a.creator_id=s.id
+		left join sys_user u on a.auditor_id=u.id
+    	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="action != null">
+	    		AND a.action=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
+	    	and a.is_valid!=-1
+	    </trim>
+		ORDER BY a.CFG_ID
+  </select>
   <!-- <select id="findAppPolicyList" resultMap="AppPolicyCfgMap" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
 		select 
 		<include refid="AppPolicyCfg_Column"/>	
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 290bd0efc..8f11f9514 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -3,6 +3,7 @@ package com.nis.web.service.configuration;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +25,7 @@ import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.configuration.AppFeatureIndex;
+import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.AvFileSampleCfg;
 import com.nis.domain.configuration.BaseCfg;
@@ -46,6 +48,8 @@ import com.nis.domain.maat.MaatCfg.GroupCfg;
 import com.nis.domain.maat.MaatCfg.IpCfg;
 import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.domain.specific.ConfigGroupInfo;
+import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
@@ -54,6 +58,8 @@ import com.nis.util.ServiceConfigTemplateUtil;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.CommonPolicyDao;
 import com.nis.web.dao.configuration.ConfigSynchronizationDao;
+import com.nis.web.dao.specific.ConfigGroupInfoDao;
+import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -68,6 +74,10 @@ public class ConfigSynchronizationService  extends BaseService{
 	protected ConfigSynchronizationDao configSynchronizationDao;
 	@Autowired
 	protected CommonPolicyDao commonPolicyDao;
+	@Autowired
+	protected SpecificServiceCfgDao specificServiceCfgDao;
+	@Autowired
+	protected ConfigGroupInfoDao configGroupInfoDao;
 	/**
 	 * 配置全量更新下发
 	 * @param request
@@ -1107,15 +1117,25 @@ public class ConfigSynchronizationService  extends BaseService{
 			entity.setPage(page);
 			List list = Lists.newArrayList();
 			if(cfgType==1){
-				list = configSynchronizationDao.getIpPortListByService(entity);
+				if(entity.getServiceId().equals(1028)){
+					list = configSynchronizationDao.getAppIpFeatureList(entity);
+				}else{
+					list = configSynchronizationDao.getIpPortListByService(entity);
+				}
 			}else if(cfgType==2){
 				list = configSynchronizationDao.getStrListByService(entity);
 			}else if(cfgType==3){
 				list = configSynchronizationDao.getComplexStrListByService(entity);
 			}
 			if(!StringUtil.isEmpty(list)){
-				hasData=auditSingleMaatData(cfgType,userRegionList,
-						page,entity,list,hasData,isUpdateCfg);
+				if(entity.getServiceId().equals(1028)){
+					hasData=auditAppIpData(userRegionList,
+							page,entity,list,hasData,isUpdateCfg);
+				}else{
+					hasData=auditSingleMaatData(cfgType,userRegionList,
+							page,entity,list,hasData,isUpdateCfg);
+				}
+				
 				if(hasData) {
 					page.setPageNo(page.getNext());
 				}
@@ -1155,9 +1175,6 @@ public class ConfigSynchronizationService  extends BaseService{
 		List<NumBoundaryCfg> numRegionList;
 		List<DigestCfg> digestRegionList;
 		List<IpCfg> areaIpRegionList;
-		
-		
-		List<IpPortCfg> ipList = new ArrayList();
 		maatBean = new ToMaatBean();		
 		configCompileList = new ArrayList();
 		//批量获取regionId,groupId
@@ -1211,7 +1228,6 @@ public class ConfigSynchronizationService  extends BaseService{
 			}
 			list1.add(cfg);
 			if(list1.size()>0){
-				ipList.removeAll(list1);
 				Map<String,List> map = cfgToMaatConvert(ipRegionList,list1,1,groupRelationList);
 				groupRelationList=map.get("groupList");
 				ipRegionList=map.get("dstList");
@@ -1294,8 +1310,6 @@ public class ConfigSynchronizationService  extends BaseService{
 		List<DigestCfg> digestRegionList;
 		List<IpCfg> areaIpRegionList;
 		
-		
-		List cfgList = new ArrayList();
 		maatBean = new ToMaatBean();		
 		configCompileList = new ArrayList();
 		//批量获取regionId,groupId
@@ -1314,8 +1328,8 @@ public class ConfigSynchronizationService  extends BaseService{
 				BeanUtils.copyProperties(list.get(i), complexStrCfg);
 			}
 			BeanUtils.copyProperties(list.get(i), cfg);
-			cfg.setRegionId(regionIds.get(i));
-			cfg.setGroupId(groupIds.get(i));
+//			cfg.setRegionId(regionIds.get(i));
+//			cfg.setGroupId(groupIds.get(i));
 			cfg.setIsValid(entity.getIsValid());
 			cfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg = new MaatCfg();
@@ -1346,7 +1360,6 @@ public class ConfigSynchronizationService  extends BaseService{
 							}else if(cfgType==3){
 								aClass = ComplexkeywordCfg.class;
 							}
-							
 						}
 						Object value = "";
 						Field field = aClass.getDeclaredField(regionColumn);
@@ -1393,7 +1406,6 @@ public class ConfigSynchronizationService  extends BaseService{
 			}
 			
 			if(list1.size()>0){
-				cfgList.removeAll(list1);
 				if(cfgType==1){
 					Map<String,List> map = cfgToMaatConvert(ipRegionList,list1,1,groupRelationList);
 					groupRelationList=map.get("groupList");
@@ -1451,26 +1463,121 @@ public class ConfigSynchronizationService  extends BaseService{
 		return hasData;
 	}
 	/**
-	 * 处理app业务maat类配置
+	 * 处理app ip特征（分组复用）配置
 	 * @param serviceId
 	 * @param request
 	 * @param response
 	 */
-	public void handleAppMaatData(List<Map<String,Object>>cfgList,List<Map<String,Object>>userRegionList,
-			Page<BaseCfg> page,Object entity,HttpServletRequest request,HttpServletResponse response){
-		/*if(entity instanceof AppPolicyCfg){
-			AppPolicyCfg newEntity = entity;
-			entity.setPage(page);
-		}
+	public boolean auditAppIpData(List<Map<String,Object>>userRegionList,
+			Page<T> page,
+			BaseCfg entity,
+			List<T> list,
+			boolean hasData,
+			boolean isUpdateCfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
 		
-		boolean hasData = true;
-		while(hasData){
-			List<CfgIndexInfo> list = configSynchronizationDao.getCfgIndexList(entity);
-			page.setList(list);
-			if(page.isLastPage()){
-				hasData = false;
+		ToMaatBean maatBean;		
+		MaatCfg maatCfg;
+		List<MaatCfg> configCompileList;
+		List<GroupCfg> groupRelationList;
+		List<IpCfg> ipRegionList;
+		List<StringCfg> strRegionList;
+		List<NumBoundaryCfg> numRegionList;
+		List<DigestCfg> digestRegionList;
+		List<IpCfg> areaIpRegionList;
+		
+		maatBean = new ToMaatBean();		
+		configCompileList = new ArrayList();
+		//同一编译IP的分组
+		Map<Integer,List<AppIpCfg>> dataMap=new HashMap<>();
+		for(int i=0;i<list.size();i++){
+			AppIpCfg cfg = new AppIpCfg();
+			BeanUtils.copyProperties(list.get(i), cfg);
+			cfg.setIsValid(entity.getIsValid());
+			cfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
+			if(dataMap.containsKey(cfg.getCompileId())) {
+				dataMap.get(cfg.getCompileId()).add(cfg);
+			}else {
+				List<AppIpCfg> ipList=new ArrayList<>();
+				ipList.add(cfg);
+				dataMap.put(cfg.getCompileId(), ipList);
 			}
-		}*/
+		}
+		for(List<AppIpCfg> entitys:dataMap.values()) {
+			maatCfg = new MaatCfg();
+			maatCfg.initDefaultValue();
+			groupRelationList = new ArrayList();
+			ipRegionList = new ArrayList();
+			strRegionList = new ArrayList();
+			numRegionList = new ArrayList();
+			digestRegionList = new ArrayList();
+			areaIpRegionList = new ArrayList();
+
+			SpecificServiceCfg specificServiceCfg=specificServiceCfgDao.getBySpecServiceId(entitys.get(0).getSpecServiceId());
+			ConfigGroupInfo configGroupInfo=configGroupInfoDao.getConfigGroupInfoByGroupId(specificServiceCfg.getGroupId()); 
+			/*if(configGroupInfo==null) {
+				Integer groupId = ConfigServiceUtil.getId(2, 1).get(0);
+				specificServiceCfg.setGroupId(groupId);
+				configGroupInfo = new ConfigGroupInfo();
+				configGroupInfo.setGroupId(specificServiceCfg.getGroupId());
+				configGroupInfo.setGroupName(specificServiceCfg.getSpecServiceName());
+				configGroupInfo.setIsIssued(0);
+				configGroupInfo.setCompileId(entitys.get(0).getCompileId());
+				configGroupInfo.setGroupType(1);
+				configGroupInfoDao.insertConfigGroupInfo(configGroupInfo);
+				//更新group_id
+				specificServiceCfg.setOpTime(new Date());
+				specificServiceCfgDao.update(specificServiceCfg);
+			}*/
+			Integer groupId=configGroupInfo.getGroupId();
+			GroupCfg groupCfg=new GroupCfg();
+			groupCfg.setCompileId(entitys.get(0).getCompileId());
+			groupCfg.setGroupId(groupId);
+			groupCfg.setIsValid(Constants.VALID_YES);
+			groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime())?entitys.get(0).getAuditTime():entity.getAuditTime());
+			groupRelationList.add(groupCfg);
+			BeanUtils.copyProperties(entitys.get(0), maatCfg);
+			ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_YES,groupId));
+			maatCfg.setAction(entitys.get(0).getAction());
+			maatCfg.setAuditTime(entitys.get(0).getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entitys.get(0).getIsValid());
+			// 设置APP自定义域
+			String userRegion = "APP_ID=" + entitys.get(0).getAppCode()/*+Constants.USER_REGION_SPLIT+"ASEV_ID="+businessType*/;
+			maatCfg.setUserRegion(userRegion);
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entitys.get(0).getAuditTime());
+			maatBean.setCreatorName(entitys.get(0).getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+		}
+		page.setList(list);
+		if(page.isLastPage()){
+			hasData = false;
+		}
+		if(!StringUtil.isEmpty(configCompileList.size())){
+			String json=gsonToJson(maatBean);
+			//调用服务接口下发配置数据
+			if(isUpdateCfg) {
+				logger.info("配置批量下发："+json);
+				//调用服务接口同步回调类配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				if(result!=null){
+					logger.info("配置批量下发响应信息："+result.getMsg());
+				}
+			}else {
+				//调用服务接口配置全量更新
+//				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
+			}
+			
+		}
+		return hasData;
 	}
 
 	/**
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 842c73102..ab5661c89 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -354,6 +354,9 @@
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	</service>
+	<service id="1152" functionId="560" serviceType="1" cfgType="2" tableName="app_topic_domain_cfg" className="AppTopicDomainCfg"  desc="关注话题域名">
+    	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"  userRegionPosition="0"></userRegion>
+	</service>
 	<!-- APP、基础协议、 加密协议行为配置结束-->
 	
 	<!-- 回调类配置开始 -->