From 20f4765b3ca6f5e778ee34fb2a5c9489b7e2e102 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Thu, 13 Dec 2018 20:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=88=86=E7=BB=84=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=93=8D=E4=BD=9C=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basics/AsnIpController.java    |  9 +++++
 .../com/nis/web/dao/basics/AsnIpCfgDao.java   |  1 +
 .../com/nis/web/dao/basics/AsnIpCfgDao.xml    |  3 ++
 .../web/service/basics/AsnIpCfgService.java   |  3 ++
 .../resources/messages/message_en.properties  |  3 +-
 .../resources/messages/message_ru.properties  |  3 +-
 .../messages/message_zh_CN.properties         |  3 +-
 .../WEB-INF/views/basics/policyGroupList.jsp  | 34 ++++++++++++++++---
 8 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
index 93a2cd78b..d78ccde84 100644
--- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java
+++ b/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
diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
index b074a2a2c..8830e6f96 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
+++ b/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);
 }
diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
index 25d5f62ec..6f00e58b4 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
+++ b/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
diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
index 2ca551a64..790fc367a 100644
--- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
+++ b/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);
+	}
 }
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 0cd93a99e..d02eff9e8 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1364,4 +1364,5 @@ message_type=Code
 nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
-av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
\ No newline at end of file
+av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
+asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 49a3b9b42..9603f4e6b 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1368,4 +1368,5 @@ message_type=Code
 nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
-av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F.
\ No newline at end of file
+av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F.
+asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 09e5e28b8..70ced3471 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1364,4 +1364,5 @@ message_type=Code
 nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
-av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301
\ No newline at end of file
+av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301
+asn_ip_group_delete=(\u8BE5ASN\u7EC4\u4E0B\u7684IP\u914D\u7F6E\u4E5F\u4F1A\u88AB\u5220\u9664)
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
index 0f8b887f2..427afdd8e 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
@@ -46,6 +46,7 @@
  		 if(str.substr(str.length-1)== ','){
  		    ids = str.substr(0,str.length-1);
  		  }
+ 		 
  		 var canDel=true;
  		 var tip='<spring:message code="can_not_delete_issued_asn_group"/>';
  		 if(serviceGroupIds.length>0){
@@ -60,7 +61,7 @@
  					}
  				}
  			});
- 			if(canDel){
+ 			/* if(canDel){ // 不能删除包含ASN IP的 ASN组
  				$.ajax({
  	 				type:'post',
  	 				url:'${ctx}/basics/policyGroup/ajaxHasAsnIPs',
@@ -73,11 +74,35 @@
  	 					}
  	 				}
  	 			});
- 			}
+ 			} */
  		 }
  		 if(canDel){
- 			window.location = url+"&ids="+ids;
- 		 }else{
+ 			var added = "";
+ 			if(serviceGroupIds.length != 0){
+ 				added = "<spring:message code='asn_ip_group_delete'/>";
+ 			}
+ 			top.$.jBox.confirm("<spring:message code='confirm_message'/>"+added,"<spring:message code='info'/>",function(v,h,f){
+ 				if(v=="ok"){
+ 					if(serviceGroupIds.length != 0){
+	 					$.ajax({
+	 	 	 				type:'post',
+	 	 	 				url:'${ctx}/basics/asn/ajaxDeleteAsnIp',
+	 	 	 				data:{"ids":serviceGroupIds.join(',')},
+	 	 	 				async:false,
+	 	 	 				success:function(data,textStatus){
+	 	 	 					if(textStatus == "success"){
+	 	 	 						window.location = url+"&ids="+ids;
+	 	 	 					}
+	 	 	 				}
+	 	 	 			});
+ 					}else{
+ 						window.location = url+"&ids="+ids;
+ 					}
+ 					
+ 				}
+ 			},{buttonsFocus:1});
+			top.$('.jbox-body .jbox-icon').css('top','55px');
+		 }else{
  			 $.jBox.tip(tip);
  			 return false;
  		 }
@@ -159,6 +184,7 @@
                                         <a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0')" data-toggle="tooltip" data-placement="top">
 											<i class="fa fa-trash"> <spring:message code="delete"/></i>
 										</a>
+										<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
                                   <%--  </shiro:hasPermission> --%>
                                		
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips"