From a4bd74e5c28e10a4d057df714d1afd12a3c1ed2e Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Thu, 25 Oct 2018 20:16:23 +0800
Subject: [PATCH] =?UTF-8?q?asn=20ip=E5=88=86=E7=BB=84=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E5=9F=9F?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=94=A8=E6=88=B7=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=9F=9FASN=5FID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/basics/AsnIpCfgDao.xml    | 22 ++++++++++++++++---
 .../java/com/nis/web/service/BaseService.java |  2 ++
 .../WEB-INF/views/basics/asnIpCfgFormAdd.jsp  |  8 ++++++-
 .../views/basics/asnIpCfgFormUpdate.jsp       |  8 ++++++-
 4 files changed, 35 insertions(+), 5 deletions(-)

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 94e20ea0e..a93a1c3da 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
@@ -36,6 +36,11 @@
 	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
 	    <result column="asn_ip_group" property="asnIpGroup" jdbcType="INTEGER" />
 	    <result column="asn_ip_group_name" property="asnIpGroupName" jdbcType="VARCHAR" />
+	    <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
+	    <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
+	    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
+	    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
+	    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
     </resultMap>
   
     <sql id="columns">
@@ -44,7 +49,8 @@
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
 		r.region_id,r.is_area_effective,r.classify,r.attribute,r.lable
-		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.asn_ip_group
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.asn_ip_group,r.user_region1
+		,r.user_region2,r.user_region3,r.user_region4,r.user_region5
     </sql>
     
     <select id="findPage" resultMap="asnIpCfgMap">
@@ -234,7 +240,12 @@
     dest_ip_address,
     cfg_type,
     cfg_region_code,
-    asn_ip_group
+    asn_ip_group,
+    user_region1,
+    user_region2,
+    user_region3,
+    user_region4,
+    user_region5
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -267,7 +278,12 @@
     	#{destIpAddress,jdbcType=VARCHAR},
     	#{cfgType,jdbcType=VARCHAR},
     	#{cfgRegionCode,jdbcType=INTEGER},
-    	#{asnIpGroup,jdbcType=INTEGER}
+    	#{asnIpGroup,jdbcType=INTEGER},
+    	#{userRegion1,jdbcType=VARCHAR},
+    	#{userRegion2,jdbcType=VARCHAR},
+    	#{userRegion3,jdbcType=VARCHAR},
+    	#{userRegion4,jdbcType=VARCHAR},
+    	#{userRegion5,jdbcType=VARCHAR}
     )
   </insert>
     <update id="updateIssued" parameterType="com.nis.domain.basics.AsnIpCfg" >
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 3748aad8f..42892f1b2 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -752,6 +752,8 @@ public abstract class BaseService {
 				BeanUtils.copyProperties(baseIpCfg, cfg);
 				cfg.setGroupId(asnIpCfg.getAsnIpGroup());
 				cfg.setRegionId(asnIpCfg.getRegionId());
+				String userRegion = "ASN_ID=" + asnIpCfg.getUserRegion1();
+				cfg.setUserRegion(userRegion);
 			}else if(_cfg instanceof AppIpCfg) {
 				AppIpCfg appIpCfg=(AppIpCfg)_cfg;
 				BeanUtils.copyProperties(appIpCfg, baseIpCfg);
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
index 2a41c4ff5..f70df9208 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
@@ -22,6 +22,11 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
+	$("#asnId").val($("select[name='asnIpGroup'] option:selected").attr("asnId"));
+	$("select[name='asnIpGroup']").on("change",function(){
+		var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId");
+		$("#asnId").val(asnId);
+	});
 });
 //业务窗口打开
 var addContent = function(obj, contentClassName) {
@@ -134,13 +139,14 @@ var reSort=function(obj,index){
 								        </div>
 								    </div>
 								    <div class="col-md-6">
+								    	<input type="hidden" id="asnId" name="userRegion1" value="${_cfg.userRegion1}">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
 								            <div class="col-md-6">
 								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 								            		<%-- <option value="0" ><spring:message code="default_group"/></option>--%>
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
-														<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+														<option asnId="${policyGroup.asnNo}" value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
 								                </select>
 								            </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
index 38d0edddd..ae9f1ad65 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
@@ -19,6 +19,11 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
+	$("#asnId").val($("select[name='asnIpGroup'] option:selected").attr("asnId"));
+	$("select[name='asnIpGroup']").on("change",function(){
+		var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId");
+		$("#asnId").val(asnId);
+	});
 });
 </script>
 </head>
@@ -78,12 +83,13 @@ $(function(){
 								        </div>
 								    </div>
 								    <div class="col-md-6">
+								    	<input type="hidden" id="asnId" name="userRegion1" value="${_cfg.userRegion1}">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
 								            <div class="col-md-6">
 								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
-														<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+														<option asnId="${policyGroup.asnNo}" value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
 								                </select>
 								            </div>