修复bug:
1.区域阻断范围字段导出数据与界面上显示不一致,界面上显示全部、导出的excel字段显示为否 2.界面上存在日志总量字段,导出的数据中不存在 3.导出数据包含字段blacklist option,界面上不存在
This commit is contained in:
@@ -53,6 +53,7 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
|
||||
private String userRegion5;
|
||||
private String configType;
|
||||
|
||||
|
||||
@ExcelField(title="encrypted_tunnel_behavior",sort=5)
|
||||
private String behaviorName;
|
||||
@ExcelField(title="social_app",sort=5)
|
||||
@@ -108,6 +109,9 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
|
||||
@SerializedName("isHexbin")
|
||||
private Integer isHexbin;
|
||||
|
||||
@ExcelField(title="log_total",sort=31)
|
||||
private Long totalLogs;
|
||||
|
||||
private List<IpPortCfg> ipPortList;
|
||||
private IpPortCfg ipPort;
|
||||
private NtcSubscribeIdCfg ntcSubscribeIdCfg;
|
||||
@@ -278,5 +282,13 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
|
||||
public void setIndexTable(String indexTable) {
|
||||
this.indexTable = indexTable;
|
||||
}
|
||||
|
||||
public Long getTotalLogs() {
|
||||
return totalLogs;
|
||||
}
|
||||
|
||||
public void setTotalLogs(Long totalLogs) {
|
||||
this.totalLogs = totalLogs;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -263,7 +263,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
|
||||
protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
|
||||
@ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=31)
|
||||
protected Integer doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
|
||||
|
||||
protected Integer groupId;//仅用于copy属性使用
|
||||
protected Integer regionId;//仅用于copy属性使用
|
||||
protected Integer numberRegionGroupId;//仅用于copy属性使用
|
||||
|
||||
@@ -84,6 +84,8 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
|
||||
private String country;
|
||||
private String detail;
|
||||
private List<AsnKeywordCfg> asnKeywords;
|
||||
@ExcelField(title="log_total",sort=31)
|
||||
private Long totalLogs;
|
||||
|
||||
/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
|
||||
|
||||
@@ -402,5 +404,11 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
|
||||
this.complexCfg = complexCfg;
|
||||
}
|
||||
|
||||
|
||||
public Long getTotalLogs() {
|
||||
return totalLogs;
|
||||
}
|
||||
|
||||
public void setTotalLogs(Long totalLogs) {
|
||||
this.totalLogs = totalLogs;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user