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 @@ + + + + + @@ -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 @@ -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} ) 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){ + * <%-- --%> - selected> + selected> 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); + }); }); @@ -78,12 +83,13 @@ $(function(){ + * - selected> + selected>