From 7dfe52590be13f4700ae864e36bc8665c68d97a7 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 24 Jun 2019 11:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPolicy=20Group=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=88=97=E9=A1=BA=E5=BA=8F=EF=BC=8Caction=E4=B8=8E?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8Curl?= =?UTF-8?q?=E7=BB=84=E4=B8=AD=E5=87=BA=E7=8E=B0null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/configuration/ObjGroupCfg.java | 12 ++++++------ .../configuration/ObjectGroupController.java | 2 +- .../service/configuration/ObjectGroupService.java | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java b/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java index c175e7d16..7a2e82e05 100644 --- a/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java +++ b/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java @@ -4,17 +4,16 @@ import com.nis.util.excel.ExcelField; public class ObjGroupCfg extends BaseCfg { - @ExcelField(title="ip_group",sort=50) + @ExcelField(title="ip_group",sort=33) private String ipGroup; - @ExcelField(title="url_group",sort=51) + @ExcelField(title="url_group",sort=35) private String urlGroup; - @ExcelField(title="subscribe_id_group",sort=52) + @ExcelField(title="subscribe_id_group",sort=34) private String subscribeIdGroup; - @ExcelField(title="domain_group",sort=53) + @ExcelField(title="domain_group",sort=36) private String domainGroup; - @ExcelField(title="action",sort=2) + @ExcelField(title="block_type",sort=2)//这里没有使用公共方法处理，直接将字典值set进去了，不用使用dictType protected String actionCode; - public String getActionCode() { return actionCode; } @@ -54,4 +53,5 @@ public class ObjGroupCfg extends BaseCfg { public void setDomainGroup(String domainGroup) { this.domainGroup = domainGroup; } + protected Integer action;//覆盖默认的action上的注解 } diff --git a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java index 12f8fdf7b..5b5aef460 100644 --- a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java +++ b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java @@ -407,7 +407,7 @@ public class ObjectGroupController extends BaseController { titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), ObjGroupCfg.class); - String cfgIndexInfoNoExport=",block_type,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-"; + String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null) { diff --git a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java index ed7ddce5e..9d267b705 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java +++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java @@ -563,9 +563,10 @@ public class ObjectGroupService extends BaseService { } } } +// c.setActionCode(c.getAction().toString()); for (FunctionServiceDict service : serviceList) { if(c.getAction().intValue()==service.getAction().intValue()){ - c.setActionCode(msgProp.getProperty(service.getActionCode(),service.getActionCode())); + c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode())); } } } @@ -587,7 +588,7 @@ public class ObjectGroupService extends BaseService { c.setIpGroup(name); policyGroupInfoMap.remove(e.getKey()); }else if(e.getValue().getGroupType().equals(Constants.URL_OBJ_GROUP_TYPE)){ - String name=(StringUtils.isBlank(c.getIpGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName(); + String name=(StringUtils.isBlank(c.getUrlGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName(); c.setUrlGroup(name); policyGroupInfoMap.remove(e.getKey()); }else if(e.getValue().getGroupType().equals(Constants.SUBID_OBJ_GROUP_TYPE)){ @@ -624,9 +625,10 @@ public class ObjectGroupService extends BaseService { } } } +// c.setActionCode(c.getAction().toString()); for (FunctionServiceDict service : serviceList) { if(c.getAction().intValue()==service.getAction().intValue()){ - c.setActionCode(msgProp.getProperty(service.getActionCode(),service.getActionCode())); + c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode())); } } } @@ -648,7 +650,7 @@ public class ObjectGroupService extends BaseService { c.setIpGroup(name); policyGroupInfoMap.remove(e.getKey()); }else if(e.getValue().getGroupType().equals(Constants.URL_OBJ_GROUP_TYPE)){ - String name=(StringUtils.isBlank(c.getIpGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName(); + String name=(StringUtils.isBlank(c.getUrlGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName(); c.setUrlGroup(name); policyGroupInfoMap.remove(e.getKey()); }else if(e.getValue().getGroupType().equals(Constants.SUBID_OBJ_GROUP_TYPE)){