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

src/main/java/com/nis/web/controller/basics/AsnIpController.java

@@ -128,6 +128,15 @@ public class AsnIpController extends BaseController{
 			
 		return "redirect:" + adminPath +"/basics/asn/list?functionId="+functionId;
 	}
+	
+	@RequestMapping(value = {"/ajaxDeleteAsnIp"})
+	public void ajaxDeleteAsnIp(String ids, HttpServletRequest request, HttpServletResponse response){
+		try{
+			asnIpCfgService.ajaxDeleteAsnIp(ids);
+		}catch(Exception e){
+			logger.error("Delete failed",e);
+		}
+	}
 	/**
 	 * ajax设置Name
 	 * @param model

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java

@@ -25,4 +25,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
 	public int deleteByAsnGroup(@Param("asnId")String asnNo);
 	public int insertBatch(List<AsnIpCfg> list);
 	public Varibles getVaribles(@Param("name")String name);
+	public void ajaxDeleteAsnIp(@Param("ids")String ids);
 }

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml

@@ -407,6 +407,9 @@
    </delete>
    <update id="delete" parameterType="java.lang.String" >
     delete from asn_ip_cfg where cfg_id in (${ids}) 
+   </update>
+   <update id="ajaxDeleteAsnIp" parameterType="java.lang.String" >
+    delete from asn_ip_cfg where asn_ip_group in (${ids}) 
    </update>
 	<select id="findOtherIps" resultType="java.lang.Integer" parameterType="java.lang.Integer">
 	  select 1 from asn_ip_cfg where is_valid=1 and asn_ip_group=#{groupId} and cfg_id !=#{cfgId} limit 1

src/main/java/com/nis/web/service/basics/AsnIpCfgService.java

@@ -465,4 +465,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			asnNoList.clear();
 		}
 	}
+	public void ajaxDeleteAsnIp(String ids) {
+		asnIpCfgDao.ajaxDeleteAsnIp(ids);
+	}
 }