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"); } } + // 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 { public void auditWhiteDomain(HttpUrlCfg cfg) throws Exception{ List beans=new ArrayList<>(); beans.add(cfg); - this.auditBatch(beans, DomainDao.class); + domainDao.audit(cfg); List configCompileList = new ArrayList<>(); List groupRelationList = new ArrayList<>(); List ipRegionList = new ArrayList<>(); @@ -185,7 +185,7 @@ public class DomainService extends CrudService { public void auditDomain(HttpUrlCfg cfg) throws Exception{ List beans=new ArrayList<>(); beans.add(cfg); - this.auditBatch(beans, DomainDao.class); + domainDao.audit(cfg); List beans1=new ArrayList<>(); List 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 { //更新IP配置与区域IP的状态 List beans=new ArrayList<>(); beans.add(cfg); - this.auditBatch(beans, IpCfgDao.class); + ipCfgDao.audit(cfg); List beans1=new ArrayList<>(); List areaIpCfgList=areaIpCfgDao.getByCompileId(cfg.getCompileId()); for(AreaIpCfg area:areaIpCfgList){ @@ -166,12 +166,29 @@ public class IpCfgService extends CrudService { List 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 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 ipList=new ArrayList<>(); @@ -281,7 +298,7 @@ public class IpCfgService extends CrudService { public void auditWhiteIp(BaseIpCfg cfg) throws Exception{ List beans=new ArrayList<>(); beans.add(cfg); - this.auditBatch(beans, IpCfgDao.class); + ipCfgDao.audit(cfg); List configCompileList = new ArrayList<>(); List groupRelationList = new ArrayList<>(); List ipRegionList = new ArrayList<>();