antiddos 界面的字段展示及导出顺序优化

This commit is contained in:
leijun
2018-11-16 10:26:37 +08:00
parent e5215accb9
commit 89253a265d
5 changed files with 64 additions and 61 deletions

View File

@@ -154,7 +154,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 来函
*/
@ExcelField(title="letter",sort=50)
@ExcelField(title="letter",sort=58)
protected String requestName;
/**
* 是否区域gk

View File

@@ -43,24 +43,24 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
*/
@Expose
@SerializedName("ipType")
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
protected Integer ipType;
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45)
protected Integer ipPattern;
@ExcelField(title="client_ip",sort=5)
@ExcelField(title="client_ip",sort=47)
protected String srcIpAddress;
@ExcelField(title="server_ip",sort=4)
@ExcelField(title="server_ip",sort=46)
protected String destIpAddress;
@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=7)
@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
protected Integer portPattern;
@ExcelField(title="client_port",sort=8)
@ExcelField(title="client_port",sort=49)
protected String srcPort;
@ExcelField(title="server_port",sort=9)
@ExcelField(title="server_port",sort=50)
protected String destPort;
protected Integer dnsStrategyId;
@ExcelField(title="ir_type",dictType="IR_TYPE",sort=10)
@ExcelField(title="ir_type",dictType="IR_TYPE",sort=51)
protected Integer irType;
@ExcelField(title="group_name",sort=11)
@ExcelField(title="group_name",sort=52)
protected String groupName;
private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -127,14 +127,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
*/
@Expose
@SerializedName("direction")
@ExcelField(title="direction",dictType="DIRECTION",sort=12)
@ExcelField(title="direction",dictType="DIRECTION",sort=53)
protected Integer direction ;
/**
* 协议
*/
@Expose
@SerializedName("protocol")
@ExcelField(title="protocol",dictType="PROTOCOL",sort=13)
@ExcelField(title="protocol",dictType="PROTOCOL",sort=54)
protected Integer protocol ;
/**
* 协议ID

View File

@@ -23,11 +23,11 @@ public class DdosIpCfg extends BaseIpCfg {
*/
private static final long serialVersionUID = -5446903784736960824L;
private String indexTable="ddos_ip_cfg";
@ExcelField(title="antiddos_protocol",sort=22)
@ExcelField(title="antiddos_protocol",sort=41)
private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP
@ExcelField(title="bps_threadshold",sort=23)
@ExcelField(title="bps_threadshold",sort=42)
private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值每秒Bit数和每秒包数
@ExcelField(title="pps_threadshold",sort=24)
@ExcelField(title="pps_threadshold",sort=43)
private Long ppsThreadshold;
public String getAntiddosProtocol() {

View File

@@ -134,7 +134,7 @@ public class DdosCfgController extends BaseController {
Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), DdosIpCfg.class);
String cfgIndexInfoNoExport=",client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",do_log,client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/