音视频内容IP审核功能完成

音视频图片IP功能完成音视频VOIP界面protocolId修改
2018-05-31 17:21:34 +08:00
parent 95cf618e72
commit 56151dfad9
11 changed files with 1238 additions and 81 deletions
--- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
@@ -1,10 +1,8 @@
 package com.nis.web.service.configuration;


-import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

@@ -13,22 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.nis.domain.Page;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.AvContIpCfg;
-import com.nis.domain.configuration.AvFileSampleCfg;
-import com.nis.domain.configuration.AvSignSampleCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.AvVoipIpCfg;
+import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.HttpBodyCfg;
-import com.nis.domain.configuration.HttpReqHeadCfg;
-import com.nis.domain.configuration.HttpResHeadCfg;
-import com.nis.domain.configuration.HttpUrlCfg;
-import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
@@ -61,6 +50,8 @@ public class AvContentCfgService extends BaseService{
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
 	
+	
+	/********************************voip业务*********************************/
 	/**
 	 * 查询分页数据
 	 * @param page 分页对象
@@ -253,7 +244,18 @@ public class AvContentCfgService extends BaseService{
 						//新增
 						entity.setCreatorId(UserUtils.getUser().getId());
 						entity.setCreateTime(createTime);
-						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType"});
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+																				,"cfgType"
+																				,"ipType"
+																				,"ipPattern"
+																				,"srcIpAddress"
+																				,"portPattern"
+																				,"srcPort"
+																				,"destPort"
+																				,"protocol"
+																				,"direction"
+																				,"protocolId"
+																				});
 						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
 					}
 				}
@@ -428,26 +430,29 @@ public class AvContentCfgService extends BaseService{
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
 			//调用服务接口取消配置
 			String json=gsonToJson(maatBean);
-			logger.info("http配置下发配置参数："+json);
+			logger.info("voip配置下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.put(json,1);
-			logger.info("http配置取消配置响应信息："+result.getMsg());
+			logger.info("voip配置取消配置响应信息："+result.getMsg());
 		}
 		
 		
 	}
+	/********************************voip业务*********************************/
 	
 	
+	/********************************contIp业务*********************************/
 	/**
 	 * contIp查询分页数据
 	 * @param page 分页对象
 	 * @param entity
 	 * @return
 	 */
-	public Page<AvContIpCfg> findContIpPage(Page page, AvContIpCfg entity) {
+	public Page<BaseIpCfg> findContIpPage(Page page, BaseIpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
-		List<AvContIpCfg> list=avContentCfgDao.findContIpList(entity);
+		entity.setTableName("av_cont_ip_cfg");
+		List<BaseIpCfg> list=avContentCfgDao.findIpList(entity);
 		page.setList(list);
 		return page;
 	}
@@ -457,12 +462,14 @@ public class AvContentCfgService extends BaseService{
 	 * @param entity
 	 * @return
 	 */
-	public AvContIpCfg getContIpCfgById(AvContIpCfg entity) {
-		return avContentCfgDao.findContIpCfgById(entity);
+	public BaseIpCfg getContIpCfgById(BaseIpCfg entity) {
+		entity.setTableName("av_cont_ip_cfg");
+		return avContentCfgDao.findIpCfgById(entity);
 	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveOrUpdateAvContIp(AvContIpCfg entity,String areaCfgIds){
+	public void saveOrUpdateContIp(BaseIpCfg entity,String areaCfgIds){
 		Date createTime=new Date();
+		entity.setTableName("av_cont_ip_cfg");
 		
 		//区域IPsetAreaEffectiveIds设置
 		List<AreaIpCfg> areaCfg=entity.getAreaCfg();
@@ -510,13 +517,24 @@ public class AvContentCfgService extends BaseService{
 				//保存区域IP信息
 				if(entity.getAreaCfg()!=null&&entity.getAreaCfg().size()>0){
 					for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
-						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType"});
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+																				,"cfgType"
+																				,"ipType"
+																				,"ipPattern"
+																				,"srcIpAddress"
+																				,"portPattern"
+																				,"srcPort"
+																				,"destPort"
+																				,"protocol"
+																				,"direction"
+																				,"protocolId"
+																				});
 						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
 					}
 				}
 				
 				//保存cfgIndexInfo
-				avContentCfgDao.insertAvContIp(entity);
+				avContentCfgDao.insertIp(entity);
 			}else{
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}
@@ -538,13 +556,36 @@ public class AvContentCfgService extends BaseService{
 						//修改
 						entity.setEditorId(UserUtils.getUser().getId());
 						entity.setEditTime(editTime);
-						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType","cfgId"});
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+																				,"cfgType"
+																				,"cfgId"
+																				,"ipType"
+																				,"ipPattern"
+																				,"srcIpAddress"
+																				,"portPattern"
+																				,"srcPort"
+																				,"destPort"
+																				,"protocol"
+																				,"direction"
+																				,"protocolId"
+																				});
 						areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
 					}else{
 						//新增
 						entity.setCreatorId(UserUtils.getUser().getId());
 						entity.setCreateTime(createTime);
-						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType"});
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+								,"ipType"
+								,"ipPattern"
+								,"srcIpAddress"
+								,"portPattern"
+								,"srcPort"
+								,"destPort"
+								,"protocol"
+								,"direction"
+								,"protocolId"
+								});
 						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
 					}
 				}
@@ -561,7 +602,448 @@ public class AvContentCfgService extends BaseService{
 			
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(editTime);
-			avContentCfgDao.updateAvContIp(entity);
+			avContentCfgDao.updateIp(entity);
 		}
 	}
+	
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void updateContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		BaseIpCfg entity = new BaseIpCfg();
+		entity.setTableName("av_cont_ip_cfg");
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			avContentCfgDao.updateIp(entity);
+			AreaIpCfg areaIpCfg=new AreaIpCfg();
+			BeanUtils.copyProperties(entity, areaIpCfg);
+			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditContIp(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
+		BaseIpCfg entity = new BaseIpCfg();
+		entity.setTableName("av_cont_ip_cfg");
+		
+		List<BaseIpCfg> list = new ArrayList();
+		List<AreaIpCfg> areaIpCfgList = new ArrayList();
+		
+		entity.setCfgId(Long.parseLong(id));
+		entity = avContentCfgDao.findIpCfgById(entity);
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		
+		
+		avContentCfgDao.updateIp(entity);
+		AreaIpCfg areaIpCfg=new AreaIpCfg();
+		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+				,"cfgType"
+				,"cfgId"
+				,"ipType"
+				,"ipPattern"
+				,"srcIpAddress"
+				,"portPattern"
+				,"srcPort"
+				,"destPort"
+				,"protocol"
+				,"direction"
+				,"protocolId"
+				});
+		
+		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+		
+		list=avContentCfgDao.getIpList(entity);
+		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();
+		
+		if(isAudit==1){
+			if(!StringUtil.isEmpty(list)){
+				Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
+				groupRelationList=ipMap.get("groupList");
+				ipRegionList=ipMap.get("dstList");
+			}
+			
+			if(!StringUtil.isEmpty(areaIpCfgList)){
+				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
+				groupRelationList=areaMap.get("groupList");
+				areaIpRegionList=areaMap.get("dstList");
+			}
+		}
+		
+		//构造提交综合服务参数格式，一条配置提交一次综合服务
+		if(isAudit==1){
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(entity.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(entity.getIsValid());
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("contIp配置下发配置参数："+json);
+			//TODO 调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			//logger.info("contIp配置下发响应信息："+result.getMsg());
+
+		}else if(isAudit==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("contIp配置下发配置参数："+json);
+			//调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.put(json,1);
+			//logger.info("http配置取消配置响应信息："+result.getMsg());
+		}
+	}
+	/********************************contIp业务*********************************/
+	
+	
+	/********************************picIp业务*********************************/
+	/**
+	 * picIp查询分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<BaseIpCfg> findPicIpPage(Page page, BaseIpCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		entity.setTableName("av_pic_ip_cfg");
+		List<BaseIpCfg> list=avContentCfgDao.findIpList(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	/**
+	 * picIp根据id查询contIpCfg信息
+	 * @param entity
+	 * @return
+	 */
+	public BaseIpCfg getPicIpCfgById(BaseIpCfg entity) {
+		entity.setTableName("av_pic_ip_cfg");
+		return avContentCfgDao.findIpCfgById(entity);
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdatePicIp(BaseIpCfg entity,String areaCfgIds){
+		Date createTime=new Date();
+		entity.setTableName("av_pic_ip_cfg");
+		//区域IPsetAreaEffectiveIds设置
+		List<AreaIpCfg> areaCfg=entity.getAreaCfg();
+		List<AreaBean> areaIsps=entity.getAreaIsp();
+		if(Constants.IS_AREA_EFFECTIVE_NO==entity.getIsAreaEffective()){
+			entity.setAreaEffectiveIds("");
+			entity.setAreaType(null);
+		}else if(Constants.IS_AREA_EFFECTIVE_YES==entity.getIsAreaEffective()){
+			if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
+				StringBuffer areaEffectiveIds=new StringBuffer();
+				for(int i=0;i<areaIsps.size();i++){
+					if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
+						areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
+					}else{
+						areaEffectiveIds.append(areaIsps.get(i).getArea());
+					}
+					if(i!=areaIsps.size()-1){
+						areaEffectiveIds.append(",");
+					}
+				}
+				entity.setAreaEffectiveIds(areaEffectiveIds.toString());
+			}else if(Constants.AREA_EFFECTIVE_TYPE_AREA_IP==entity.getAreaType()&&areaCfg!=null&&areaCfg.size()>0){
+				entity.setAreaEffectiveIds("");
+			}
+		}
+		
+		//新增
+		if(entity.getCfgId()==null){
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			//调用服务接口获取compileId
+			List<Integer> compileIds = new ArrayList<Integer>();
+			try {
+				compileIds = ConfigServiceUtil.getId(1,1);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+				entity.setCompileId(compileIds.get(0));
+				
+				//保存区域IP信息
+				if(entity.getAreaCfg()!=null&&entity.getAreaCfg().size()>0){
+					for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+								,"ipType"
+								,"ipPattern"
+								,"srcIpAddress"
+								,"portPattern"
+								,"srcPort"
+								,"destPort"
+								,"protocol"
+								,"direction"
+								,"protocolId"
+								});
+						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+					}
+				}
+				
+				//保存cfgIndexInfo
+				avContentCfgDao.insertIp(entity);
+			}else{
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+			}
+			
+			//修改
+		}else{
+			Date editTime=new Date();
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			
+			areaCfgIds=!StringUtil.isEmpty(areaCfgIds)? ","+areaCfgIds:"";
+			
+			if(!StringUtil.isEmpty(entity.getAreaCfg())){
+				for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) {
+					if(!StringUtil.isEmpty(areaIpCfg.getCfgId())){
+						if(areaCfgIds.contains(","+areaIpCfg.getCfgId()+",")){
+							areaCfgIds=areaCfgIds.replace(areaIpCfg.getCfgId()+",", "");
+						}
+						//修改
+						entity.setEditorId(UserUtils.getUser().getId());
+						entity.setEditTime(editTime);
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+								,"cfgId"
+								,"ipType"
+								,"ipPattern"
+								,"srcIpAddress"
+								,"portPattern"
+								,"srcPort"
+								,"destPort"
+								,"protocol"
+								,"direction"
+								,"protocolId"
+								});
+						areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+					}else{
+						//新增
+						entity.setCreatorId(UserUtils.getUser().getId());
+						entity.setCreateTime(createTime);
+						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+								,"cfgType"
+								,"ipType"
+								,"ipPattern"
+								,"srcIpAddress"
+								,"portPattern"
+								,"srcPort"
+								,"destPort"
+								,"protocol"
+								,"direction"
+								,"protocolId"
+								});
+						areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
+					}
+				}
+			}
+			//delete 真是删除areaIpCfg信息
+			if(!StringUtil.isEmpty(areaCfgIds.replaceAll(",", ""))){
+				areaCfgIds=areaCfgIds.substring(1,areaCfgIds.length());
+				for (String cfgId : areaCfgIds.split(",")) {
+					AreaIpCfg areaIpCfg=new AreaIpCfg();
+					areaIpCfg.setCfgId(Long.parseLong(cfgId));
+					areaIpCfgDao.deleteAreaIpCfgByCfgId(areaIpCfg);
+				}
+			}
+			
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			avContentCfgDao.updateIp(entity);
+		}
+	}
+	
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void updatePicIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		BaseIpCfg entity = new BaseIpCfg();
+		entity.setTableName("av_pic_ip_cfg");
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			avContentCfgDao.updateIp(entity);
+			AreaIpCfg areaIpCfg=new AreaIpCfg();
+			BeanUtils.copyProperties(entity, areaIpCfg);
+			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditPicIp(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
+		BaseIpCfg entity = new BaseIpCfg();
+		entity.setTableName("av_pic_ip_cfg");
+		List<BaseIpCfg> list = new ArrayList();
+		List<AreaIpCfg> areaIpCfgList = new ArrayList();
+		
+		entity.setCfgId(Long.parseLong(id));
+		entity = avContentCfgDao.findIpCfgById(entity);
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		
+		
+		avContentCfgDao.updateIp(entity);
+		AreaIpCfg areaIpCfg=new AreaIpCfg();
+		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
+				,"cfgType"
+				,"cfgId"
+				,"ipType"
+				,"ipPattern"
+				,"srcIpAddress"
+				,"portPattern"
+				,"srcPort"
+				,"destPort"
+				,"protocol"
+				,"direction"
+				,"protocolId"
+				});
+		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
+		
+		list=avContentCfgDao.getIpList(entity);
+		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();
+		
+		if(isAudit==1){
+			if(!StringUtil.isEmpty(list)){
+				Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
+				groupRelationList=ipMap.get("groupList");
+				ipRegionList=ipMap.get("dstList");
+			}
+			
+			if(!StringUtil.isEmpty(areaIpCfgList)){
+				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
+				groupRelationList=areaMap.get("groupList");
+				areaIpRegionList=areaMap.get("dstList");
+			}
+		}
+		
+		//构造提交综合服务参数格式，一条配置提交一次综合服务
+		if(isAudit==1){
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(entity.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(entity.getIsValid());
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("contIp配置下发配置参数："+json);
+			//TODO 调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			//logger.info("contIp配置下发响应信息："+result.getMsg());
+			
+		}else if(isAudit==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("contIp配置下发配置参数："+json);
+			//调用服务接口下发配置
+			//ToMaatResult result = ConfigServiceUtil.put(json,1);
+			//logger.info("http配置取消配置响应信息："+result.getMsg());
+		}
+	}
+	/********************************contIp业务*********************************/
 }