gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asn ip分组分组复用增加删除域加入用户自定义域ASN_ID

Browse Source
This commit is contained in:
wangxin
2018-10-25 20:16:23 +08:00
parent 5b89e6cff5
commit a4bd74e5c2
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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" >

2
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -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);

8
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
View File

@@ -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>

8
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
View File

@@ -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>