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

asn is_valid=0，删除时，删除其下的asn ip;

Browse Source 
asn列表修改增加is_valid展示，修改is issued的展示
This commit is contained in:
duandongmei
2019-01-16 19:31:45 +06:00
parent 81da172c70
commit 9e8316603a
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,6 +224,8 @@ public class AsnGroupInfoService extends BaseService{
List<AsnGroupInfo> asnList=asnGroupInfoDao.findAsnGroupInfoByAsnNos(Arrays.asList(asnIds.split(",")), 1); List<AsnGroupInfo> asnList=asnGroupInfoDao.findAsnGroupInfoByAsnNos(Arrays.asList(asnIds.split(",")), 1);
//修改asn为无效，且解除引用 //修改asn为无效，且解除引用
asnGroupInfoDao.updateIsUsedAndIsValid(Arrays.asList(asnIds.split(",")), 0, -1); asnGroupInfoDao.updateIsUsedAndIsValid(Arrays.asList(asnIds.split(",")), 0, -1);
//删除asn下的所有asn IP
asnIpCfgDao.deleteByAsnId(asnIds);
//查询已经被策略引用的asn，需要走取消接口 //查询已经被策略引用的asn，需要走取消接口
if(!StringUtil.isEmpty(asnList)){ if(!StringUtil.isEmpty(asnList)){

7
src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
View File

@@ -233,7 +233,8 @@
<th class="sort-column r.country"><spring:message code="country"/></th> <th class="sort-column r.country"><spring:message code="country"/></th>
<th class="sort-column r.detail"><spring:message code="detail"/></th> <th class="sort-column r.detail"><spring:message code="detail"/></th>
<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th> <th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
<th class="sort-column r.is_valid"><spring:message code="is_issued"/></th> <th class="sort-column r.is_used"><spring:message code="is_issued"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th> <th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th> <th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th> <th><spring:message code="editor"/></th>
@@ -263,6 +264,10 @@
</a> </a>
</td> </td>
<td>${cfg.asnId}</td> <td>${cfg.asnId}</td>
<td>
<c:if test="${cfg.isUsed==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isUsed==1}"><spring:message code="yes"/></c:if>
</td>
<td> <td>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if> <c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if> <c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>