asn 相关修改提交

(1)asn_ip_cfg增加四列
(2)新增asn_group_info表
(3)asn ip菜单移动到policy object下,新增审核审计菜单
(4)asn ip导入修改,适应新的需求放弃了使用AsnCache,直接从数据库查
(5)asn ip加入审核流程
(6)Packet IP选择asn时,改为选中一个组织,审核下发的配置为as号字符串域
(7)asn ip 新增业务新增function_service_dict字典,serviceId为400
This commit is contained in:
wangxin
2019-01-04 18:28:57 +06:00
parent 429b1841f1
commit 85507b5a55
44 changed files with 2596 additions and 767 deletions

View File

@@ -17,15 +17,58 @@ $(function(){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
$("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
$("[name='detail']").val($("[name='userRegion1'] option:selected").attr("detail"));
$("[name='asnIpGroup']").val($("[name='userRegion1'] option:selected").attr("asnIpGroup"));
loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
});
$("#asnId").val($("select[name='asnIpGroup'] option:selected").attr("asnId"));
/* $("#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 organization=$("[name='organization']").val();
if(organization){
$.ajax({
type:'post',
url:'${ctx}/basics/asn/ajaxGetGroups',
data:{"org":organization},
async:false,
success:function(data,textStatus){//处理返回结果
if(data){
var html='';
for(var i in data){
html+="<option value='"+data[i].asnId+"' country='"+data[i].country+"' detail='"+data[i].detail+"' asnIpGroup='"+data[i].groupId+"' >"
+data[i].country+" AS"+data[i].asnId+" "+data[i].detail+"</option>"
}
$("[name='userRegion1']").empty().append(html);
$("[name='userRegion1']").selectpicker("refresh");
}
}
});
}
$("[name='organization']").on("change",function(){
$.ajax({
type:'post',
url:'${ctx}/basics/asn/ajaxGetGroups',
data:{"org":$(this).val()},
async:false,
success:function(data,textStatus){//处理返回结果
if(data){
var html='';
for(var i in data){
html+="<option value='"+data[i].asnId+"' country='"+data[i].country+"' detail='"+data[i].detail+"' asnIpGroup='"+data[i].groupId+"' >"
+data[i].country+" AS"+data[i].asnId+" "+data[i].detail+"</option>"
}
$("[name='userRegion1']").empty().append(html);
$("[name='userRegion1']").selectpicker("refresh");
}
}
});
});
});
//业务窗口打开
@@ -105,11 +148,14 @@ var reSort=function(obj,index){
<!-- BEGIN FORM-->
<form id="cfgFrom" action="${ctx}/basics/asn/save" method="post" class="form-horizontal">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="0">
<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
<input type="hidden" id="action" name="action" value="0">
<input type="hidden" id="compileId" name="compileId" value="0">
<input type="hidden" id="requestId" name="requestId" value="0">
<input type="hidden" id="asnIpGroup" name="asnIpGroup" value="0">
<c:forEach items="${serviceList}" var="service">
<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
<input type="hidden" id="action" name="action" value="${service.action}">
</c:forEach>
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
@@ -138,13 +184,13 @@ var reSort=function(obj,index){
</div>
</div>
</div>
<div class="col-md-6">
<%-- <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>--%>
<option value="0" ><spring:message code="default_group"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<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>
@@ -152,6 +198,53 @@ var reSort=function(obj,index){
</div>
<div for="asnIpGroup"></div>
</div>
</div> --%>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="organization"/></label>
<div class="col-md-6">
<select name="organization" 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.groupName}" <c:if test="${_cfg.organization eq policyGroup.groupName }">selected</c:if>>${policyGroup.groupName}</option>
</c:forEach>
</select>
<%-- <input class="form-control required" type="text" name="organization" value="${_cfg.organization}"> --%>
</div>
<div for="organization"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ASN"/></label>
<div class="col-md-6">
<select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
</select>
<%-- <input class="form-control required digits" type="text" name="userRegion1" value="${_cfg.userRegion1}"> --%>
</div>
<div for="userRegion1"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="country"/></label>
<div class="col-md-6">
<input class="form-control required" type="hidden" name="country" value="${_cfg.country}">
</div>
<div for="country"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="detail"/></label>
<div class="col-md-6">
<input class="form-control required" type="hidden" name="detail" value="${_cfg.detail}">
</div>
<div for="detail"></div>
</div>
</div>
</div>
<!-- desc and action -->