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

1月16号之前的asn版本修改组织输入为asn 号输入

Browse Source
This commit is contained in:
duandongmei
2019-01-21 18:26:22 +06:00
parent 7e1875b384
commit 9ff1643e30
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/controller/basics/AsnGroupController.java
View File

@@ -155,14 +155,11 @@ public class AsnGroupController extends BaseController {
*/
@ResponseBody
@RequestMapping(value = {"/checkAsnNo"})
public boolean checkIp(AsnGroupInfo cfg, HttpServletRequest request, HttpServletResponse response){
public AsnGroupInfo checkIp(AsnGroupInfo cfg, HttpServletRequest request, HttpServletResponse response){
AsnGroupInfo policyGroup = asnGroupInfoService.getInfoByAsnNo(cfg);
if(policyGroup == null){
return true;
}
return false;
return policyGroup;
}
/**
* 校验asn号是否已存在

16
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -165,9 +165,11 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
}
}
if(regionDict!=null) {
String org=entity.getUserRegion4();
List<AsnGroupInfo> asnGroupInfos=asnGroupInfoDao.getValidConfigGroupInfoByName(org);
for(AsnGroupInfo info:asnGroupInfos) {
AsnGroupInfo asnSearch=new AsnGroupInfo();
asnSearch.setOrganization(entity.getUserRegion4());
asnSearch.setAsnId(Long.valueOf(entity.getUserRegion5()));
AsnGroupInfo info=asnGroupInfoDao.getGroupInfo(asnSearch);
if(info != null){
BaseStringCfg<AsnKeywordCfg> asnKeywordCfg=new AsnKeywordCfg();
BeanUtils.copyProperties(entity, asnKeywordCfg,new String[]{"cfgId","cfgDesc","cfgRegionCode","cfgType","userRegion1","userRegion2","userRegion3"});
asnKeywordCfg.setTableName(AsnKeywordCfg.getTablename());
@@ -233,10 +235,12 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
}
if(regionDict!=null) {
//先删除asn keyword
String org=entity.getUserRegion4();
stringCfgDao.deleteAsnKeyword(entity);
List<AsnGroupInfo> asnGroupInfos=asnGroupInfoDao.getValidConfigGroupInfoByName(org);
for(AsnGroupInfo info:asnGroupInfos) {
AsnGroupInfo asnSearch=new AsnGroupInfo();
asnSearch.setOrganization(entity.getUserRegion4());
asnSearch.setAsnId(Long.valueOf(entity.getUserRegion5()));
AsnGroupInfo info=asnGroupInfoDao.getGroupInfo(asnSearch);
if(info != null){
BaseStringCfg<AsnKeywordCfg> asnKeywordCfg=new AsnKeywordCfg();
BeanUtils.copyProperties(entity, asnKeywordCfg,new String[]{"cfgId","cfgDesc","cfgRegionCode","cfgType","userRegion1","userRegion2","userRegion3"});
asnKeywordCfg.setTableName(AsnKeywordCfg.getTablename());

7
src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp
View File

@@ -17,16 +17,17 @@
<div class="col-md-6">
<%-- <input type="hidden" name="userRegion5" value="${_cfg.userRegion5}"> --%>
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="organization"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ASN"/></label>
<div class="col-md-6">
<%-- <select name="userRegion4" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup">
<option asnId="${policyGroup.asnId}" value="${policyGroup.groupName}" <c:if test="${asn==policyGroup.groupName }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select> --%>
<input class="form-control required invisibleChar orgMustExists" type="text" name="userRegion4" value="${asn}" ctx="${ctx}">
<input class="form-control required invisibleChar asnMustExists" type="text" name="userRegion5" value="${_cfg.userRegion5}" ctx="${ctx}">
<input class="form-control required invisibleChar orgMustExists hidden" type="text" name="userRegion4" value="${asn}" ctx="${ctx}">
</div>
<div for="userRegion4"></div>
<div for="userRegion5"></div>
</div>
</div>
</div>

2
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -77,7 +77,7 @@
}
});
//处理asn id
$(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId"));
/* $(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId")); */
$(".asn").find("select[name='userRegion4']").on("change",function(){
var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId");
$(this).parents(".row").find("input[name='userRegion5']").val(asnId);

4
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
View File

@@ -221,7 +221,7 @@
<c:if test="${(region[0] eq 3) && (not empty _cfg.asnKeywords)}">
<c:forEach items="${_cfg.asnKeywords}" var="asn">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="row hidden" >
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='organization'/>:</label>
@@ -236,7 +236,7 @@
<div class="form-group">
<label><spring:message code='asn_no'/>:</label>
<label>
${asn.cfgKeywords}
${_cfg.userRegion5}
</label>
</div>
</div>

8
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -978,10 +978,12 @@ jQuery.validator.addMethod("asnMustExists",function(value, element) {
url: url,
data:{"asnId":value},
success:function(data){
if(data==true){
result=false;
}else{
if(data != null && data !='' && data != 'undefined'){
$("input[name='userRegion4']").val(data.organization);
console.log($("input[name='userRegion4']").val());
result=true;
}else{
result = false;
}
}
});