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

修复Policy Group导出列顺序，action与界面不一致，url组中出现null

Browse Source
This commit is contained in:
wangxin
2019-06-24 11:08:27 +08:00
parent 1eaf3fb4c6
commit 7dfe52590b
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/configuration/ObjGroupCfg.java
View File

@@ -4,17 +4,16 @@ import com.nis.util.excel.ExcelField;
public class ObjGroupCfg extends BaseCfg<ObjGroupCfg> {
@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<ObjGroupCfg> {
public void setDomainGroup(String domainGroup) {
this.domainGroup = domainGroup;
}
protected Integer action;//覆盖默认的action上的注解
}

2
src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java
View File

@@ -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) {

10
src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
View File

@@ -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)){