From c4423ff900981a3101e1d9645cdabd5ca4d46555 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 17 Dec 2018 21:06:45 +0600 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=88=86=E7=BB=84=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=BA4=E4=B8=AA=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basics/PolicyGroupController.java | 14 ++++---- .../resources/messages/message_en.properties | 6 +++- .../resources/messages/message_ru.properties | 6 +++- .../messages/message_zh_CN.properties | 6 +++- .../sql/20181217/split_policy_group_info.sql | 4 +++ .../WEB-INF/views/basics/policyGroupForm.jsp | 24 +++++++++---- .../WEB-INF/views/basics/policyGroupList.jsp | 34 +++++++++++++++---- 7 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/sql/20181217/split_policy_group_info.sql diff --git a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java index 1dad01ccb..41c4c4300 100644 --- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java @@ -34,7 +34,6 @@ public class PolicyGroupController extends BaseController { Page pageCondition = new Page(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; } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 05940e2ad..fe5ca8f7e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1395,4 +1395,8 @@ end_ip=End IP action_detail=Action Detail pass=Pass live_link=Live Link -area_type=Area Type \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index ca7780a39..b70714770 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1399,4 +1399,8 @@ end_ip=End IP action_detail=Action Detail pass=Pass live_link=Live Link -area_type=Area Type \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 438ecd572..bb919d4d4 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1395,4 +1395,8 @@ end_ip=End IP action_detail=\u52a8\u4f5c\u8be6\u60c5 pass=Pass live_link=Live Link -area_type=Area Type \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/sql/20181217/split_policy_group_info.sql b/src/main/resources/sql/20181217/split_policy_group_info.sql new file mode 100644 index 000000000..b840c3d3f --- /dev/null +++ b/src/main/resources/sql/20181217/split_policy_group_info.sql @@ -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; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp index 926967c4c..87b48bdcc 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp @@ -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(){

- + + + + + + + + + + + +

@@ -66,6 +77,7 @@ $(function(){ +
@@ -77,7 +89,7 @@ $(function(){
-
+ <%--
@@ -91,7 +103,7 @@ $(function(){
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index 427afdd8e..5c1b28b69 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -8,6 +8,8 @@ //搜索框提示语初始化 if("${cfg.groupName}"){ $("#intype").val("${cfg.groupName}"); + }else if(''!="${cfg.asnNo}"){ + $("#intype").val("${cfg.asnNo}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -116,14 +118,25 @@ <%-- --%> <%----%>

- + + + + + + + + + + + +

@@ -133,13 +146,14 @@ +
-
+ <%--
-
+
--%>
@@ -164,7 +178,9 @@ + +
@@ -180,8 +196,8 @@
<%-- --%> - - + + <%-- --%> @@ -245,7 +261,9 @@ - + + + @@ -269,7 +287,9 @@ + ${cfg.asnNo} + ${fns:abbr(cfg.description,20)} ${cfg.creatorName }