From f474a98e50ffb39d75b45fe5554d5d183589cec4 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 7 Sep 2018 20:18:59 +0800
Subject: [PATCH] =?UTF-8?q?(1)app=20ip=20=E7=95=8C=E9=9D=A2IP=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=BD=BF=E7=94=A8function=5Fregion=5Fdict=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=20(2)app=20ip=20IP=E5=A4=8D=E7=94=A8=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/AppCfgController.java       |  21 +-
 .../nis/web/dao/configuration/AppCfgDao.java  |   1 +
 .../nis/web/dao/configuration/AppCfgDao.xml   |  13 +-
 .../java/com/nis/web/service/BaseService.java |  24 +-
 .../web/service/basics/AsnIpCfgService.java   |   4 +-
 .../service/configuration/AppCfgService.java  | 244 ++++++++++++++++--
 .../configuration/AsnPolicyCfgService.java    |   2 +-
 .../WEB-INF/views/cfg/app/appIpCfgForm.jsp    |  66 +++--
 8 files changed, 314 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
index ad4473502..8af5ac660 100644
--- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
@@ -1,7 +1,6 @@
 package com.nis.web.controller.configuration;
 
 import java.io.File;
-import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -10,7 +9,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.POST;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -41,13 +39,11 @@ import com.nis.domain.configuration.AppTopicDomainCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.WebsiteDomainTopic;
-import com.nis.domain.configuration.AppBuiltInFeatureFile;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.domain.maat.ToMaatResult.ResponseData;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
-import com.nis.util.CodeDicUtils;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
@@ -55,8 +51,6 @@ import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
-import com.nis.web.dao.configuration.AppBuiltInFeatureDao;
-import com.nis.web.dao.dashboard.codedic.CodeResult;
 import com.nis.web.security.UserUtils;
 
 /**
@@ -313,6 +307,8 @@ public class AppCfgController extends BaseController {
 	public String auditAppIpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		AppIpCfg entity = new AppIpCfg();
 		String[] idArray = ids.split(",");
+		//同一编译IP的分组
+		Map<Integer,List<AppIpCfg>> dataMap=new HashMap<>();
 		for(String id :idArray){
 			entity = appCfgService.getAppIpCfg(Long.parseLong(id));
 			entity.setIsAudit(isAudit);
@@ -320,14 +316,25 @@ public class AppCfgController extends BaseController {
 			entity.setAuditorId(UserUtils.getUser().getId());
 			entity.setAuditTime(new Date());
 			entity.setFunctionId(functionId);
+			entity.setTableName(AppIpCfg.getTablename());
+			if(dataMap.containsKey(entity.getCompileId())) {
+				dataMap.get(entity.getCompileId()).add(entity);
+			}else {
+				List<AppIpCfg> ipList=new ArrayList<>();
+				ipList.add(entity);
+				dataMap.put(entity.getCompileId(), ipList);
+			}
+		}
+		for(List<AppIpCfg> entitys:dataMap.values()) {
 			try {
-				appCfgService.auditAppIpCfg(entity,isAudit);
+				appCfgService.auditAppIpCfg(entitys,isAudit);
 			} catch (MaatConvertException e) {
 				e.printStackTrace();
 				logger.info("app协议IP配置下发失败："+e.getMessage());
 				addMessage(redirectAttributes, e.getMessage());
 			}
 		}
+		
 		return "redirect:" + adminPath +"/app/ipCfgList?functionId="+functionId;
 	}
 	/**
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
index 3a0355574..49245396e 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
@@ -98,4 +98,5 @@ public interface AppCfgDao {
 	//域名关联表操作
 	public List<WebsiteDomainTopic> getDomainDict(WebsiteDomainTopic websiteDomainTopic);
 	public void saveDomainDict(WebsiteDomainTopic websiteDomainTopic);
+	public List<AppIpCfg> getAppIpCfgBySpecServiceId(Integer specServiceId);
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index ea17409ff..20ed830c1 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -394,7 +394,7 @@
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
     r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
-    r.DIRECTION,r.PROTOCOL,r.DO_LOG
+    r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
   </sql>
   
   <sql id="AppHttpCfg_Column" >
@@ -526,6 +526,12 @@
     FROM app_ip_cfg r
     WHERE CFG_ID = #{cfgId,jdbcType=BIGINT}
   </select>
+  <select id="getAppIpCfgBySpecServiceId" resultMap="AppIpCfgMap" parameterType="java.lang.Integer" >
+    SELECT 
+    <include refid="AppIpCfg_Column" />
+    FROM app_ip_cfg r
+    WHERE r.spec_service_id = #{specServiceId,jdbcType=INTEGER} and r.is_valid !=-1 order by r.compile_id desc limit 1
+  </select>
   <select id="getAppHttpCfg" resultMap="AppHttpCfgMap" parameterType="java.lang.Long" >
     SELECT 
     <include refid="AppHttpCfg_Column" />
@@ -1694,12 +1700,13 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
     IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
-    DIRECTION,PROTOCOL,DO_LOG
+    DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
      #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
     #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
-    #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+    #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
+    ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )
   </insert>
   <insert id="insertAppHttpCfg" parameterType="com.nis.domain.configuration.AppHttpCfg" >
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 23eaa740d..3ab43fd2b 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -32,6 +32,7 @@ import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.callback.NtcDnsResStrategy;
 import com.nis.domain.callback.ProxyObjKeyring;
+import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseCfg;
@@ -738,16 +739,25 @@ public abstract class BaseService {
 		return replaceContent;
 	}
 	//asn IP 复用转换
-	public List<IpCfg> groupReuseCfgAddRemoveConvert(List<AsnIpCfg> ipCfgList,Integer isValid) {
+	public List<IpCfg> groupReuseCfgAddRemoveConvert(List<? extends BaseCfg<?>> ipCfgList,Integer isValid,Integer groupId) {
 		Date opTime=new Date();
 		List<IpCfg> maatIpList=new ArrayList<>();
-		for(AsnIpCfg asnIpCfg:ipCfgList) {
-			BaseIpCfg baseIpCfg = new BaseIpCfg();
-			BeanUtils.copyProperties(asnIpCfg, baseIpCfg);
+		for(BaseCfg<?> _cfg:ipCfgList) {
 			IpCfg cfg = new IpCfg();
-			BeanUtils.copyProperties(baseIpCfg, cfg);
-			cfg.setGroupId(asnIpCfg.getAsnIpGroup());
-			cfg.setRegionId(asnIpCfg.getRegionId());
+			BaseIpCfg baseIpCfg = new BaseIpCfg();
+			if(_cfg instanceof AsnIpCfg) {
+				AsnIpCfg asnIpCfg=(AsnIpCfg)_cfg;
+				BeanUtils.copyProperties(asnIpCfg, baseIpCfg);
+				BeanUtils.copyProperties(baseIpCfg, cfg);
+				cfg.setGroupId(asnIpCfg.getAsnIpGroup());
+				cfg.setRegionId(asnIpCfg.getRegionId());
+			}else if(_cfg instanceof AppIpCfg) {
+				AppIpCfg appIpCfg=(AppIpCfg)_cfg;
+				BeanUtils.copyProperties(appIpCfg, baseIpCfg);
+				BeanUtils.copyProperties(baseIpCfg, cfg);
+				cfg.setGroupId(groupId);
+				cfg.setRegionId(Integer.parseInt(appIpCfg.getUserRegion1()));
+			}
 			cfg.setIsValid(isValid);
 			cfg = ipConvert(cfg,baseIpCfg);
 			cfg.setAuditTime(opTime);
diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
index 98c08b27e..8c29b5797 100644
--- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
+++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
@@ -91,7 +91,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			GroupReuseAddBean maatBean = new GroupReuseAddBean();		
 			List<GroupReuseCfg> groupReuseList=new ArrayList<>();
 			GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
-			List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(entity.getAsnIpCfgs(),Constants.VALID_YES);
+			List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(entity.getAsnIpCfgs(),Constants.VALID_YES,null);
 			List<StringCfg> strRegionList = new ArrayList<>();
 			List<NumBoundaryCfg> numRegionList = new ArrayList<>();
 			groupReuseCfg.setIpRegionList(ipRegionList);
@@ -146,7 +146,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			GroupReuseAddBean maatBean = new GroupReuseAddBean();		
 			List<GroupReuseCfg> groupReuseList=new ArrayList<>();
 			GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
-			List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(issuedList,Constants.VALID_NO);
+			List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(issuedList,Constants.VALID_NO,null);
 			List<StringCfg> strRegionList = new ArrayList<>();
 			List<NumBoundaryCfg> numRegionList = new ArrayList<>();
 			groupReuseCfg.setIpRegionList(ipRegionList);
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index e082d1bb8..dd4e27150 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -5,6 +5,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +27,8 @@ import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.WebsiteDomainTopic;
+import com.nis.domain.maat.GroupReuseAddBean;
+import com.nis.domain.maat.GroupReuseCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.MaatCfg.DigestCfg;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -32,6 +37,8 @@ import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 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.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
@@ -41,8 +48,10 @@ import com.nis.util.StringUtils;
 import com.nis.web.dao.configuration.AppCfgDao;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.StringCfgDao;
+import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
+import com.nis.web.service.SpringContextHolder;
 
 /**
  * 特定协议相关配置事务类
@@ -58,6 +67,8 @@ public class AppCfgService extends BaseService {
 	protected AreaIpCfgDao areaIpCfgDao;
 	@Autowired
 	protected StringCfgDao stringcfgDao;
+	@Autowired
+	protected SpecificServiceCfgDao specificServiceCfgDao;
 
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
@@ -289,34 +300,66 @@ public class AppCfgService extends BaseService {
 		setAreaEffectiveIds(entity);
 
 		if (entity.getCfgId() == null) {
+			
+			SpecificServiceCfg specificServiceCfg=specificServiceCfgDao.getBySpecServiceId(entity.getSpecServiceId());
+			ConfigGroupInfo configGroupInfo=specificServiceCfgDao.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.setGroupType(1);
+				specificServiceCfgDao.insertConfigGroupInfo(configGroupInfo);
+				//更新group_id
+				specificServiceCfg.setOpTime(new Date());
+				specificServiceCfgDao.update(specificServiceCfg);
+			}
 			Integer compileId = 0;
-			try {
-				List<Integer> idList = ConfigServiceUtil.getId(1, 1);
-				if (idList != null && idList.size() > 0) {
-					compileId = idList.get(0);
-				}
-				entity.setCompileId(compileId);
-				entity.setCreateTime(new Date());
-				entity.setCreatorId(entity.getCurrentUser().getId());
-				entity.setIsValid(0);
-				entity.setIsAudit(0);
-				appCfgDao.insertAppIpCfg(entity);
-
-				// 保存区域IP信息
-				if (entity.getAreaCfg() != null) {
-					for (AreaIpCfg cfg : entity.getAreaCfg()) {
-						cfg.initDefaultValue();
-						BeanUtils.copyProperties(entity, cfg,
-								new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective",
-										"areaEffectiveIds", "protocol", "portPattern", "srcPort", "destPort",
-										"direction", "destIpAddress", "srcIpAddress", "ipPattern" });
-						areaIpCfgDao.saveAreaIpCfg(cfg);
+			if(configGroupInfo.getIsIssued().intValue()==0) {//没有下发过
+			//查询AppIpCfg对应 的未下发IP的编译ID
+				List<AppIpCfg> beforeCfg=appCfgDao.getAppIpCfgBySpecServiceId(entity.getSpecServiceId());
+				if(beforeCfg==null||beforeCfg.size()==0) {//第一条，获取编译id
+					try {
+						List<Integer> idList = ConfigServiceUtil.getId(1, 1);
+						if (idList != null && idList.size() > 0) {
+							compileId = idList.get(0);
+						}
+					} catch (Exception e) {
+						e.printStackTrace();
+						logger.info("获取编译ID出错");
+						throw new MaatConvertException(e.getMessage());
 					}
+				}else {
+					compileId=beforeCfg.get(0).getCompileId();
+				}
+			}else if(configGroupInfo.getIsIssued().intValue()==1){//下发过了
+				List<AppIpCfg> beforeCfg=appCfgDao.getAppIpCfgBySpecServiceId(entity.getSpecServiceId());
+				if(beforeCfg==null||beforeCfg.size()==0) {
+					throw new RuntimeException("Can't get compileId, there is not app ip in an issued group");
+				}
+				compileId=beforeCfg.get(0).getCompileId();
+			}else {
+				throw new RuntimeException("Unknown configGroupInfo isIssued value");
+			}
+			entity.setUserRegion1(String.valueOf(ConfigServiceUtil.getId(3, 1).get(0)));
+			entity.setCompileId(compileId);
+			entity.setCreateTime(new Date());
+			entity.setCreatorId(entity.getCurrentUser().getId());
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			appCfgDao.insertAppIpCfg(entity);
+			// 保存区域IP信息
+			if (entity.getAreaCfg() != null) {
+				for (AreaIpCfg cfg : entity.getAreaCfg()) {
+					cfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, cfg,
+							new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective",
+									"areaEffectiveIds", "protocol", "portPattern", "srcPort", "destPort",
+									"direction", "destIpAddress", "srcIpAddress", "ipPattern" });
+					areaIpCfgDao.saveAreaIpCfg(cfg);
 				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				logger.info("获取编译ID出错");
-				throw new MaatConvertException(e.getMessage());
 			}
 		} else {
 			entity.setEditorId(entity.getCurrentUser().getId());
@@ -1003,6 +1046,157 @@ public class AppCfgService extends BaseService {
 			logger.info("app协议IP配置取消配置响应信息：" + result.getMsg());
 		}
 	}
+	/**
+	 * ip复用批量审核
+	 * @param data
+	 */
+	public void auditAppIpCfg(List<AppIpCfg> data) {
+		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
+        SqlSession batchSqlSession = null;
+        try{
+            batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
+            for(int index = 0; index < data.size();index++){
+            	AppIpCfg t = data.get(index);
+                ((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).auditCfg(t);
+            }
+            batchSqlSession.commit();
+        }finally {
+            if(batchSqlSession != null){
+                batchSqlSession.close();
+            }
+        }
+    }
+	public void auditAppIpCfg(List<AppIpCfg> entitys, Integer isAudit) {
+		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();
+		this.auditAppIpCfg(entitys);
+//		for(AppIpCfg entity:entitys) {
+//			// 保存区域IP信息
+//			List<AreaIpCfg> areaIpCfgList = areaIpCfgDao.getByCompileId(entitys.get(0).getCompileId());
+//			if (!StringUtil.isEmpty(areaIpCfgList)) {
+//				AreaIpCfg cfg = new AreaIpCfg();
+//				BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
+//				cfg.setTableName(AreaIpCfg.getTablename());
+//				appCfgDao.auditCfg(cfg);
+//				if (isAudit == 1) {
+//					Map<String, List> map = cfgConvert(areaIpRegionList, areaIpCfgList, 1, entity, groupRelationList);
+//					groupRelationList = map.get("groupList");
+//					areaIpRegionList = map.get("dstList");
+//				}
+//			}
+//		}
+		Integer specServiceId= entitys.get(0).getSpecServiceId();
+		SpecificServiceCfg specificServiceCfg=specificServiceCfgDao.getBySpecServiceId(specServiceId);
+		//String businessType=specificServiceCfg.getBusinessType();
+		ConfigGroupInfo configGroupInfo=specificServiceCfgDao.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.setGroupType(1);
+			specificServiceCfgDao.insertConfigGroupInfo(configGroupInfo);
+			//更新group_id
+			specificServiceCfg.setOpTime(new Date());
+			specificServiceCfgDao.update(specificServiceCfg);
+		}
+		Integer groupId=configGroupInfo.getGroupId();
+		// 构造提交综合服务参数格式，一条配置提交一次综合服务
+		if (isAudit == 1) {
+			if(configGroupInfo.getIsIssued()==0) {//未下发，下发region compile,group.
+				ToMaatBean maatBean = new ToMaatBean();
+				maatCfg.initDefaultValue();
+				//group
+				GroupCfg groupCfg=new GroupCfg();
+				groupCfg.setCompileId(entitys.get(0).getCompileId());
+				groupCfg.setGroupId(groupId);
+				groupCfg.setIsValid(Constants.VALID_YES);
+				groupCfg.setAuditTime(entitys.get(0).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);
+				// 调用服务接口下发配置数据
+				String json = gsonToJson(maatBean);
+				logger.info("app协议IP配置下发配置参数：" + json);
+				// 调用服务接口下发配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				logger.info("app协议IP配置下发响应信息：" + result.getMsg());
+				configGroupInfo.setIsIssued(1);
+				configGroupInfo.setUpdateTime(new Date());
+				specificServiceCfgDao.updateConfigGroupInfobyGroupId(configGroupInfo);
+			}else if(configGroupInfo.getIsIssued()==1) {//已经下发，分组复用下发
+				GroupReuseAddBean maatBean = new GroupReuseAddBean();		
+				List<GroupReuseCfg> groupReuseList=new ArrayList<>();
+				GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
+				ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_YES,groupId));
+				groupReuseCfg.setIpRegionList(ipRegionList);
+				groupReuseCfg.setStrRegionList(strRegionList);
+				groupReuseCfg.setNumRegionList(numRegionList);
+				groupReuseList.add(groupReuseCfg);
+				maatBean.setGroupReuseCfgList(groupReuseList);
+				maatBean.setAuditTime(entitys.get(0).getAuditTime());
+				maatBean.setCreatorName(entitys.get(0).getCurrentUser().getName());
+				maatBean.setVersion(Constants.MAAT_VERSION);
+				maatBean.setOpAction(Constants.INSERT_ACTION);
+				//调用服务接口下发配置数据
+				String json=gsonToJson(maatBean);
+				logger.info("app协议IP域新增配置下发配置参数："+json);
+				//调用服务接口下发配置
+				ToMaatResult result = ConfigServiceUtil.postGroupReuseSources(json);
+				logger.info("app协议IP域新增配置响应信息："+result.getMsg());
+			}else {
+				throw new RuntimeException("Unknown configGroupInfo isIssued value");
+			}
+		} else if (isAudit == 3) {
+			//已经下发过的,调用分组复用配置删除接口
+			GroupReuseAddBean maatBean = new GroupReuseAddBean();		
+			List<GroupReuseCfg> groupReuseList=new ArrayList<>();
+			GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
+			ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_NO,groupId));
+			groupReuseCfg.setIpRegionList(ipRegionList);
+			groupReuseCfg.setStrRegionList(strRegionList);
+			groupReuseCfg.setNumRegionList(numRegionList);
+			groupReuseList.add(groupReuseCfg);
+			maatBean.setGroupReuseCfgList(groupReuseList);
+			maatBean.setAuditTime(entitys.get(0).getAuditTime());
+			maatBean.setCreatorName(entitys.get(0).getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("app协议IP域删除配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.put(json,3);
+			logger.info("app协议IP域删除配置响应信息："+result.getMsg());
+		}
+	}
 
 	public void auditAppHttpCfg(AppHttpCfg entity, Integer isAudit) {
 		ToMaatBean maatBean = new ToMaatBean();
diff --git a/src/main/java/com/nis/web/service/configuration/AsnPolicyCfgService.java b/src/main/java/com/nis/web/service/configuration/AsnPolicyCfgService.java
index 03a79ce7e..31bb44e1f 100644
--- a/src/main/java/com/nis/web/service/configuration/AsnPolicyCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AsnPolicyCfgService.java
@@ -171,7 +171,7 @@ public class AsnPolicyCfgService extends BaseService {
 				AsnIpCfg asnIpCfg=new AsnIpCfg();
 				asnIpCfg.setAsnIpGroup(Integer.parseInt(entity.getUserRegion1()));
 				List<AsnIpCfg> allAsnIpCfgs=asnIpCfgDao.findAllList(asnIpCfg);
-				ipRegionList.addAll(groupReuseCfgAddRemoveConvert(allAsnIpCfgs,Constants.VALID_YES));
+				ipRegionList.addAll(groupReuseCfgAddRemoveConvert(allAsnIpCfgs,Constants.VALID_YES,null));
 				maatCfg.setIpRegionList(ipRegionList);
 				configCompileList.add(maatCfg);
 				maatBean.setConfigCompileList(configCompileList);
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index ff7afe747..9fa7979b2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -2,9 +2,10 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="${cfgName}"></spring:message></title>
+<title><spring:message code="app_ip_config"></spring:message></title>
 <script type="text/javascript">
 $(function(){
+	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	//initCommIpVal();
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
@@ -100,7 +101,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 								            <div class="col-md-6">
 								            	 <select name="ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="ipTypeC">
+								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 														<option value="${ipTypeC.itemCode}" 
 																<c:if test="${_cfg.ipType==ipTypeC.itemCode 
 																	|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
@@ -130,17 +131,7 @@ $(function(){
 								    </div>
 								</div>
 								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-								            <div class="col-md-6">
-								                   <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
-								                   <input class="required" type="hidden" name="srcIpAddress" value="${_cfg.srcIpAddress}">
-								            </div>
-								            <div for="destIpAddress"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
+									<div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
 								            <div class="col-md-6">
@@ -155,17 +146,47 @@ $(function(){
 								    </div>
 								</div>
 								<div class="row">
+									<div class="col-md-6">
+								        <div class="form-group ">
+								           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
+								            <div class="col-md-6">
+								                   <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+								            </div>
+								            <div for="srcIpAddress"></div>
+								        </div>
+								    </div>
 								    <div class="col-md-6">
 								      	<div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
+								            </div>
+								            <div for="srcPort"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group ">
+								           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+								            <div class="col-md-6">
+								                   <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+								            </div>
+								            <div for="destIpAddress"></div>
+								        </div>
+								     </div>
+								     <div class="col-md-6">
+										<div class="form-group ">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 								            <div class="col-md-6">
 								                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
-								                 <input type="hidden" class="portCheck" name="srcPort" value="${_cfg.srcPort}">
 								            </div>
 								            <div for="destPort"></div>
 								        </div>
-								    </div>
-						    		<div class="col-md-6">
+								     </div>
+								</div>
+								<div class="row">
+									<div class="col-md-6">
 								        <div class="form-group ">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
 								            <div class="col-md-6">
@@ -178,6 +199,19 @@ $(function(){
 								            </div>
 								            <div for="protocol"></div>
 								        </div>
+						    		</div>
+									<div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
+								            <div class="col-md-6">
+							           				<select name="direction" class="selectpicker show-tick form-control required">
+							           					<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+															<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+							            				</c:forEach>
+							           				</select>
+								            </div>
+								            <div for="direction"></div>
+								        </div>
 						    		</div>
 								</div>
 							</div>