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

src/main/java/com/nis/domain/configuration/BaseCfg.java

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

src/main/java/com/nis/domain/configuration/BaseIpCfg.java

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

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

src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java

@@ -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());
 			/*}*/

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -322,23 +322,24 @@
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
-									<th><spring:message code="ip_type"/></th>
+									<th><spring:message code="is_audit"/></th>
-									<%-- <th><spring:message code="client_ip"/></th>
+									<th><spring:message code="log_total"/></th>
-									<th><spring:message code="client_port"/></th> --%>
+									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="server_ip"/></th>
-									<th><spring:message code="server_port"/></th>
-									<th><spring:message code="ip_pattern"/></th>
-									<th><spring:message code="port_pattern"/></th>
-									<th><spring:message code="direction"/></th>
-									<th><spring:message code="protocol"/></th>
-									
 									
 									<th><spring:message code="antiddos_protocol"/></th>
 									<th><spring:message code="bps_threadshold"/></th>
 									<th><spring:message code="pps_threadshold"/></th>
-									<th><spring:message code="is_audit"/></th>
+									
-									<th><spring:message code="log_total"/></th>
+									<th><spring:message code="ip_type"/></th>
-									<th><spring:message code="whether_area_block"/></th>
+									<%-- <th><spring:message code="client_ip"/></th>
+									<th><spring:message code="client_port"/></th> --%>
+									<th><spring:message code="ip_pattern"/></th>
+									<th><spring:message code="server_ip"/></th>
+									<th><spring:message code="port_pattern"/></th>
+									<th><spring:message code="server_port"/></th>
+									<th><spring:message code="direction"/></th>
+									<th><spring:message code="protocol"/></th>
+									
 									<th><spring:message code="letter"/></th>
 								<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -366,38 +367,6 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<%-- <td>${cfg.srcIpAddress }</td>
-									<td>${cfg.srcPort }</td> --%>
-									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
-									<td>${cfg.destPort }</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-											<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-											<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>${cfg.antiddosProtocol }</td>
-									<td>${cfg.bpsThreadshold }</td>
-									<td>${cfg.ppsThreadshold }</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -416,6 +385,40 @@
 												</a>
 										</c:if>
 									</td>
+									
+									<td>${cfg.antiddosProtocol }</td>
+									<td>${cfg.bpsThreadshold }</td>
+									<td>${cfg.ppsThreadshold }</td>
+									
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+											<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<%-- <td>${cfg.srcIpAddress }</td>
+									<td>${cfg.srcPort }</td> --%>
+									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+											<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${cfg.destPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
 									<td>${cfg.requestName }</td>
 									<td >
 										<c:set var="classify"></c:set>