VPN服务器

新增添加IP重复验证
删除验证是否被IP复用-用户管理使用
IP复用-用户管理 删除验证是否被snat策略和dnat策略使用

(cherry picked from commit 436190fe8c)

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties

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

@@ -48,4 +48,8 @@ public interface IpMultiplexDao extends CrudDao<IpMultiplexDao>{
 	List<IpReusePolicyCfg> findByPage(@Param("ids")String ids);
 	
 	List<BaseIpCfg> findPageByDnat(@Param("ids")String ids);
+	
+	
+	List<IpReusePolicyCfg> findByUser(@Param("userName")String userName);
+	List<IpReuseDnatPolicyCfg> findDnatUser(@Param("userName")String userName);
 }

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

@@ -801,4 +801,22 @@
   	</select>
     
     
+    <select id="findByUser" resultMap="policyMap">
+		SELECT
+			<include refid="policyColumns"/>
+	    FROM  
+	    	ip_reuse_policy_cfg r
+	  	where  r.IS_VALID != -1
+	  	and r.user_name =#{userName}
+  	</select>
+    
+       <select id="findDnatUser" resultMap="dnatPolicyMap">
+		SELECT
+			<include refid="dnatPolicyColumns"/>
+	    FROM  
+	    	ip_reuse_dnat_policy a
+		where  a.IS_VALID != -1
+	  	and a.translated_user_id =#{userName}
+  	</select>
+    
 </mapper>