Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
段冬梅
2018-12-10 20:23:42 +08:00
6 changed files with 61 additions and 2 deletions

View File

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.beust.jcommander.internal.Lists;
import com.nis.domain.Page;
import com.nis.domain.basics.IpReuseIpCfg;
import com.nis.domain.callback.IpAddrPool;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.IpAddrPoolCfg;
@@ -286,5 +287,9 @@ public class IpAddrPoolCfgService extends BaseService{
public List<IpAddrPoolCfg> getEffectiveAddrPool() {
return ipAddrPoolCfgDao.findAddrPoolCfg();
}
public Long checkAddrPoolIp(String ip) {
return ipAddrPoolCfgDao.checkAddrPoolIp(ip);
}
}