From 0c64250fa424d8bf85cd80805ba6e3d1c90f0afd Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 3 Jul 2018 15:54:14 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E5=AE=A1=E6=A0=B8=E8=B0=83=E7=94=A8auditBat?=
 =?UTF-8?q?ch=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5=E5=8D=95=E4=B8=AAaudit?=
 =?UTF-8?q?=20(2)=E4=BF=AE=E5=A4=8DIP=E5=AE=A1=E6=A0=B8=E5=8E=BB=E9=94=99c?=
 =?UTF-8?q?onfigRegionCode=E5=AF=BC=E8=87=B4=E7=9A=84=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/BaseController.java    |  5 +++-
 .../service/configuration/DomainService.java  |  4 +--
 .../service/configuration/IpCfgService.java   | 29 +++++++++++++++----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index fe33f7e78..faaffc7df 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -660,13 +660,16 @@ public class BaseController {
 			if(protocol==null){
 				errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("direction"))+";");
 			}
-			//direction check end
+			//protocol check end
 			if(StringUtils.isNotBlank(errInfo.toString())){
 				msg.append(lineStart).append(errInfo);
 				if(line<list.size()){
 					msg.append("<br/>");
 				}
 			}
+			// requestId check start
+			Integer requestId=value.getRequestId();
+			// requestId check end
 			line++;
 		}
 		if(StringUtils.isNotBlank(msg.toString())){
diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java
index 2fb74aea4..eb45dfca2 100644
--- a/src/main/java/com/nis/web/service/configuration/DomainService.java
+++ b/src/main/java/com/nis/web/service/configuration/DomainService.java
@@ -114,7 +114,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 	public void auditWhiteDomain(HttpUrlCfg cfg) throws Exception{
 		List<HttpUrlCfg> beans=new ArrayList<>();
 		beans.add(cfg);
-		this.auditBatch(beans, DomainDao.class);
+		domainDao.audit(cfg);
 		List<MaatCfg> configCompileList = new ArrayList<>();
 		List<GroupCfg> groupRelationList = new ArrayList<>();
 		List<IpCfg> ipRegionList = new ArrayList<>();
@@ -185,7 +185,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 	public void auditDomain(HttpUrlCfg cfg) throws Exception{
 		List<HttpUrlCfg> beans=new ArrayList<>();
 		beans.add(cfg);
-		this.auditBatch(beans, DomainDao.class);
+		domainDao.audit(cfg);
 		List<BaseIpCfg> beans1=new ArrayList<>();
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(cfg.getCompileId());
 		for(AreaIpCfg area:areaIpCfgList){
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 4355c8927..3312711a4 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -130,7 +130,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		//更新IP配置与区域IP的状态
 		List<BaseIpCfg> beans=new ArrayList<>();
 		beans.add(cfg);
-		this.auditBatch(beans, IpCfgDao.class);
+		ipCfgDao.audit(cfg);
 		List<BaseIpCfg> beans1=new ArrayList<>();
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(cfg.getCompileId());
 		for(AreaIpCfg area:areaIpCfgList){
@@ -166,12 +166,29 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		List<FunctionRegionDict> dictList =  DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
 		int maatType=0;
 		//判断下发类型是走maat还是callback
-		for(FunctionRegionDict f:dictList){
-			if(f.getCfgRegionCode().intValue()==cfg.getCfgRegionCode()){
-				maatType=f.getIsMaat();
-				break;
+		if(cfg.getCfgRegionCode()!=null){
+			for(FunctionRegionDict f:dictList){
+				if(f.getConfigRegionCode().intValue()==cfg.getCfgRegionCode()){
+					maatType=f.getIsMaat();
+					break;
+				}
 			}
+		}else{
+			List<SysDataDictionaryItem>  maatServiceList = DictUtils.getDictList("MAAT_SERVICE");
+			for(SysDataDictionaryItem maatService:maatServiceList){
+				if(Integer.parseInt(maatService.getItemCode())==cfg.getServiceId().intValue()){
+					for(FunctionRegionDict f:dictList){
+						if(maatService.getItemValue().equals(f.getConfigRegionValue())){
+							maatType=f.getIsMaat();
+							break;
+						}
+					}
+					break;
+				}
+			}
+			
 		}
+		
 		if(cfg.getIsAudit()==Constants.AUDIT_YES){
 			if(maatType==Constants.CALLBACK_TYPE){
 				List<InlineIp> ipList=new ArrayList<>();
@@ -281,7 +298,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	public void auditWhiteIp(BaseIpCfg cfg) throws Exception{
 		List<BaseIpCfg> beans=new ArrayList<>();
 		beans.add(cfg);
-		this.auditBatch(beans, IpCfgDao.class);
+		ipCfgDao.audit(cfg);
 		List<MaatCfg> configCompileList = new ArrayList<>();
 		List<GroupCfg> groupRelationList = new ArrayList<>();
 		List<IpCfg> ipRegionList = new ArrayList<>();