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

asn ip 配置界面加入asn ip组的查询条件

Browse Source
This commit is contained in:
wangxin
2018-08-31 09:33:15 +08:00
parent 35a9a2ad32
commit 979ef74259
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -32,6 +32,8 @@ public class AsnIpController extends BaseController{
Page<AsnIpCfg> page = asnIpCfgService.findPage(new Page<AsnIpCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
model.addAttribute("policyGroups", policyGroups);
return "/basics/asnIpCfgList";
}
@RequestMapping(value = {"/addForm"})

1
src/main/resources/messages/message_en.properties
View File

@@ -1137,3 +1137,4 @@ can_not_edit_issued_ans_ip=Can not edit issued ASN IP
is_issued=Is Issued
asn_ip_configuration=ASN IP Configuration
asn_policy=ASN Policy
asn_ip_group=ASN IP Group

1
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1134,3 +1134,4 @@ can_not_edit_issued_ans_ip=\u4E0D\u80FD\u4FEE\u6539\u5DF2\u7ECF\u4E0B\u53D1\u8FC
is_issued=\u662F\u5426\u4E0B\u53D1
asn_ip_configuration=ASN IP\u914D\u7F6E
asn_policy=ASN\u7B56\u7565
asn_ip_group=ASN IP\u7EC4

14
src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
View File

@@ -85,15 +85,23 @@
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<%-- <c:set var="state"><spring:message code='group'/></c:set>
<form:select path="asnIpGroup" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code='asn_ip_group'/></form:option>
<c:forEach items="${policyGroups}" var="policyGroup">
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
</c:forEach>
</form:select>
</div>
<%--<div class="pull-left">
<c:set var="state"><spring:message code='group'/></c:set>
<form:select path="isAudit" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="all_states"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> --%>
</div>
</form:select>
</div>--%>
<div class="pull-left">