diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index a664d1cef..ff75b0c11 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -154,7 +154,7 @@ public class BaseCfg extends BaseEntity implements Cloneable{ /** * 来函 */ - @ExcelField(title="letter",sort=50) + @ExcelField(title="letter",sort=58) protected String requestName; /** * 是否区域gk diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index c9ce097c0..146de6aa4 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -43,24 +43,24 @@ public class BaseIpCfg extends BaseCfg { */ @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 ntcSubscribeIdCfgList; @@ -127,14 +127,14 @@ public class BaseIpCfg extends BaseCfg { */ @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 diff --git a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java index aefa33776..91200ff60 100644 --- a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java @@ -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() { diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index 53f192ae4..6ea6f246c 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -134,7 +134,7 @@ public class DdosCfgController extends BaseController { Page 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()); /*}*/ diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index e6bd842ee..5f1f802c4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -322,23 +322,24 @@ - - <%-- - --%> - - - - - - - + + + - - - + + + <%-- + --%> + + + + + + + @@ -366,38 +367,6 @@ - - - - - - <%-- ${cfg.srcIpAddress } - ${cfg.srcPort } --%> - ${fns:abbr(cfg.destIpAddress, 42)} - ${cfg.destPort } - - - - - - - - - - - - - - - - - - - - - ${cfg.antiddosProtocol } - ${cfg.bpsThreadshold } - ${cfg.ppsThreadshold } @@ -416,6 +385,40 @@ + + ${cfg.antiddosProtocol } + ${cfg.bpsThreadshold } + ${cfg.ppsThreadshold } + + + + + + + + + + + + <%-- ${cfg.srcIpAddress } + ${cfg.srcPort } --%> + ${fns:abbr(cfg.destIpAddress, 42)} + + + + + + ${cfg.destPort } + + + + + + + + + + ${cfg.requestName }