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

src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.nis.domain.basics.IpReuseIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.IpAddrPoolCfg;
 import com.nis.web.dao.CrudDao;
@@ -34,6 +35,8 @@ public interface IpAddrPoolCfgDao extends CrudDao<IpAddrPoolCfgDao>{
 
 	Long getAddrPoolIdByName(String addrPoolName);
 
+	Long checkAddrPoolIp(@Param("srcIpAddress")String ip);
+
 
 
 }

src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml

@@ -477,4 +477,13 @@
 		WHERE 
 			r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1
 	</select>
+	
+	<select id="checkAddrPoolIp" resultType="java.lang.Long">
+		SELECT
+			r.cfg_id
+		FROM 
+			ip_reuse_ip_cfg r 
+		WHERE 
+			r.src_ip_address = #{srcIpAddress} AND r.is_valid != -1 AND r.is_audit != 3
+	</select>
 </mapper>