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

策略分组拆分为4个菜单

Browse Source
This commit is contained in:
wangxin
2018-12-17 21:06:45 +06:00
parent 570a98f87a
commit c4423ff900
7 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
View File

@@ -34,7 +34,6 @@ public class PolicyGroupController extends BaseController {
Page<PolicyGroupInfo> pageCondition = new Page<PolicyGroupInfo>(request, response,"r");
Page page = policyGroupInfoService.findPolicyGroupInfoList(pageCondition,cfg);
model.addAttribute("cfg", cfg);
model.addAttribute("page", page);
return "/basics/policyGroupList";
@@ -49,11 +48,12 @@ public class PolicyGroupController extends BaseController {
*/
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
@RequestMapping(value={"/policyGroupForm"})
public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
public String form(Integer groupType,String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
PolicyGroupInfo policyGroup=new PolicyGroupInfo();
if(!StringUtil.isEmpty(ids)){
policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids));
}
policyGroup.setGroupType(groupType);
model.addAttribute("_cfg", policyGroup);
return "/basics/policyGroupForm";
}
@@ -64,7 +64,7 @@ public class PolicyGroupController extends BaseController {
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(PolicyGroupInfo cfg,Model model,
RedirectAttributes redirectAttributes,String itType) {
RedirectAttributes redirectAttributes,String itType,Integer groupType) {
try {
policyGroupInfoService.saveOrUpdate(cfg);
@@ -74,7 +74,7 @@ public class PolicyGroupController extends BaseController {
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
}
@@ -86,7 +86,7 @@ public class PolicyGroupController extends BaseController {
*/
//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid) {
try {
policyGroupInfoService.deldete(ids,isValid);
addMessage(redirectAttributes,"success","delete_success");
@@ -94,7 +94,7 @@ public class PolicyGroupController extends BaseController {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
}
@RequestMapping(value="ajaxServiceIdState",method=RequestMethod.POST)
@ResponseBody
@@ -121,7 +121,7 @@ public class PolicyGroupController extends BaseController {
if(cfg.getGroupId() != null){
PolicyGroupInfo policyGroup = policyGroupInfoService.getInfoByAsnNo(cfg);
if(policyGroup != null && policyGroup.getAsnNo().equals(cfg.getAsnNo()) ){
if(policyGroup != null &&policyGroup.getIsValid()!=0&& policyGroup.getAsnNo().equals(cfg.getAsnNo()) ){
return true;
}
}

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

@@ -1395,4 +1395,8 @@ end_ip=End IP
action_detail=Action Detail
pass=Pass
live_link=Live Link
area_type=Area Type
area_type=Area Type
dns_group_manage=DNS Group Manage
asn_group_manage=ASN Group Manage
ip_group_manage=IP Group Manage
ip_spoofing_group_manage=IP Spoofing Group Manage

6
src/main/resources/messages/message_ru.properties
View File

@@ -1399,4 +1399,8 @@ end_ip=End IP
action_detail=Action Detail
pass=Pass
live_link=Live Link
area_type=Area Type
area_type=Area Type
dns_group_manage=DNS Group Manage
asn_group_manage=ASN Group Manage
ip_group_manage=IP Group Manage
ip_spoofing_group_manage=IP Spoofing Group Manage

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

@@ -1395,4 +1395,8 @@ end_ip=End IP
action_detail=\u52a8\u4f5c\u8be6\u60c5
pass=Pass
live_link=Live Link
area_type=Area Type
area_type=Area Type
dns_group_manage=DNS\u5206\u7EC4\u7BA1\u7406
asn_group_manage=ASN\u5206\u7EC4\u7BA1\u7406
ip_group_manage=IP\u5206\u7EC4\u7BA1\u7406
ip_spoofing_group_manage=IP Spoofing\u5206\u7EC4\u7BA1\u7406

4
src/main/resources/sql/20181217/split_policy_group_info.sql Normal file
View File

@@ -0,0 +1,4 @@
insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1197,109,'0,1,109,','asn_group_manage','ASN分组',470,'/basics/policyGroup/policyGroupList?groupType=4','','fa fa-sitemap',1,'','1','2018-12-16 22:17:54','1','2018-12-17 20:03:13','',1,NULL,0,0,NULL);
insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1203,109,'0,1,109,','ip_spoofing_group_manage','IP spoofing 分组',500,'/basics/policyGroup/policyGroupList?groupType=6','','fa fa-gear',1,'','1','2018-12-17 20:02:22','1','2018-12-17 20:09:53','',1,NULL,0,0,NULL);
insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1205,109,'0,1,109,','ip_group_manage','IP分组管理',530,'/basics/policyGroup/policyGroupList?groupType=5','','fa fa-tasks',1,'','1','2018-12-17 20:05:14','1','2018-12-17 20:08:44','',1,NULL,0,0,NULL);
UPDATE sys_menu SET CODE='dns_group_manage',NAME='dns分组管理', href='/basics/policyGroup/policyGroupList?groupType=1' WHERE id=716;

24
src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
View File

@@ -17,16 +17,16 @@ $(function(){
$("#serviceId").val($(this).attr("serviceId"));
}); */
if($("#groupType").val() == 4){
if("${_cfg.groupType}" == 4){
$("#asnNo").parents(".form-group").removeClass("hidden");
}
$("#groupType").on("change",function(){
/* $("#groupType").on("change",function(){
if($(this).val() != 4){
$("#asnNo").parents(".form-group").addClass("hidden");
}else{
$("#asnNo").parents(".form-group").removeClass("hidden");
}
});
}); */
$("#cfgFrom").validate({
errorPlacement: function(error,element){
if($(element).parents().hasClass("tagsinput")){
@@ -49,7 +49,18 @@ $(function(){
<div class="page-content">
<h3 class="page-title">
<spring:message code="policy_group_manage"></spring:message>
<c:if test="${_cfg.groupType==1}">
<spring:message code="dns_group_manage"/>
</c:if>
<c:if test="${_cfg.groupType==4}">
<spring:message code="asn_group_manage"/>
</c:if>
<c:if test="${_cfg.groupType==5}">
<spring:message code="ip_group_manage"/>
</c:if>
<c:if test="${_cfg.groupType==6}">
<spring:message code="ip_spoofing_group_manage"/>
</c:if>
</h3>
<div class="row">
@@ -66,6 +77,7 @@ $(function(){
<!-- BEGIN FORM-->
<form:form id="cfgFrom" modelAttribute="_cfg" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
<input type="hidden" name="groupId" value="${_cfg.groupId}">
<input type="hidden" name="groupType" value="${_cfg.groupType}">
<div class="form-body">
<div class="row">
<div class="col-md-6">
@@ -77,7 +89,7 @@ $(function(){
<div for="groupName"></div>
</div>
</div>
<div class="col-md-6">
<%-- <div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_type"/></label>
<div class="col-md-6">
@@ -91,7 +103,7 @@ $(function(){
</div>
<div for="groupType"></div>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-6">

34
src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
View File

@@ -8,6 +8,8 @@
//搜索框提示语初始化
if("${cfg.groupName}"){
$("#intype").val("${cfg.groupName}");
}else if(''!="${cfg.asnNo}"){
$("#intype").val("${cfg.asnNo}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
@@ -116,14 +118,25 @@
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/policyGroup/policyGroupForm'">
onClick="javascript:window.location='${ctx}/basics/policyGroup/policyGroupForm?groupType=${cfg.groupType}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<%--</shiro:hasPermission>--%>
</div>
<h3 class="page-title">
<spring:message code="policy_group_manage"/>
<c:if test="${cfg.groupType==1}">
<spring:message code="dns_group_manage"/>
</c:if>
<c:if test="${cfg.groupType==4}">
<spring:message code="asn_group_manage"/>
</c:if>
<c:if test="${cfg.groupType==5}">
<spring:message code="ip_group_manage"/>
</c:if>
<c:if test="${cfg.groupType==6}">
<spring:message code="ip_spoofing_group_manage"/>
</c:if>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
@@ -133,13 +146,14 @@
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/policyGroup/policyGroupList" method="post" class="form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="groupType" name="groupType" type="hidden" value="${cfg.groupType}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
callback="page();" />
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<%-- <div class="pull-left">
<spring:message code='group_type'/>
<select name="groupType" class="selectpicker select2 input-small">
<option value=""><spring:message code="all_types"/></option>
@@ -155,7 +169,7 @@
</c:if>
</c:forEach>
</select>
</div>
</div> --%>
<div class="pull-left">
@@ -164,7 +178,9 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
<c:if test="${cfg.groupType==4}">
<form:option value="asnNo"><spring:message code="asn_no"></spring:message></form:option>
</c:if>
</form:select>
</div>
@@ -180,8 +196,8 @@
</div>
<div class="pull-right">
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
<sys:delRow url="${ctx}/basics/policyGroup/policyGroupForm" id="contentTable" label="update"></sys:delRow>
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0')" data-toggle="tooltip" data-placement="top">
<sys:delRow url="${ctx}/basics/policyGroup/policyGroupForm?groupType=${cfg.groupType}" id="contentTable" label="update"></sys:delRow>
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0&groupType=${cfg.groupType}')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-trash"> <spring:message code="delete"/></i>
</a>
<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
@@ -245,7 +261,9 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="group_name"/></th>
<th><spring:message code="group_type"/></th>
<th><spring:message code="asn_no"/></th>
<c:if test="${cfg.groupType==4}">
<th><spring:message code="asn_no"/></th>
</c:if>
<th><spring:message code="desc"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -269,7 +287,9 @@
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</td>
<c:if test="${cfg.groupType==4}">
<td>${cfg.asnNo}</td>
</c:if>
<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>