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 91d08b4a3..906c35149 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java @@ -70,7 +70,7 @@ public interface ConfigSynchronizationDao { public List getCfgIndexList(BaseCfg entity); public List getIpPortList(@Param("tableName")String tableName,@Param("compileIds")List compileIds); - public List getAsnIpList(@Param("asnGroupIds")List asnGroupIds); + public List getAsnIpList(@Param("asnGroupIds")List asnGroupIds,@Param("isAudit")Integer isAudit); public List getStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds); public List getComplexStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds); public List getFileDigestList(@Param("tableName")String tableName,@Param("compileIds")List compileIds); 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 6ffbab9bc..ca6b6c9f5 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml @@ -1051,6 +1051,9 @@ FROM asn_ip_cfg a a.is_valid!=-1 + + AND a.is_audit=#{isAudit,jdbcType=INTEGER} + and a.asn_ip_group in #{groupId} 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 babe9babc..4915e5b37 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -264,7 +264,11 @@ public class ConfigSynchronizationService extends BaseService{ if("1".equals(m.get("cfgType"))){ if(tableName.equals("asn_ip_cfg")){ if(!StringUtil.isEmpty(asnGroupIds)) { - asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds)); + if(isUpdateCfg) { //批量审核时只查询未下发的asnip + asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds,0)); + }else { //全量下发时需要检索所有asnip + asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds,null)); + } } }else{ ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds)); @@ -361,6 +365,7 @@ public class ConfigSynchronizationService extends BaseService{ list1.add(ip); } } + if(list1.size()>0){ GroupCfg groupCfg=new GroupCfg(); groupCfg.setCompileId(cfg.getCompileId()); @@ -369,6 +374,14 @@ public class ConfigSynchronizationService extends BaseService{ groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); groupRelationList.add(groupCfg); ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null)); + }else if(!StringUtil.isEmpty(asnGroupIds)) { + GroupCfg groupCfg=new GroupCfg(); + groupCfg.setCompileId(cfg.getCompileId()); + groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4())); + groupCfg.setIsValid(entity.getIsValid()); + groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); + groupRelationList.add(groupCfg); + ipRegionList.addAll(ipRegionList); } //配置域转换 configCovert(ipList,strList,complexStrList,