Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

2019-01-17 18:26:33 +08:00
parent 5f8f109a22 a06dd1562d
commit 40b705f4db
7 changed files with 56 additions and 74 deletions
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -199,7 +199,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 来函
 	 */
-	@ExcelField(title="letter",sort=58)
+	@ExcelField(title="letter",sort=60)
 	protected String requestName;
 	/**
 	 * 是否区域gk
@@ -209,7 +209,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 分类
 	 */
-	@ExcelField(title="classification",dictType="type",sort=60)
+	@ExcelField(title="classification",dictType="type",sort=62)
 	protected String classify;
 	/**
 	 * 性质
--- 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<BaseIpCfg> {
 	 */
 	@Expose
 	@SerializedName("ipType")
-	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
+	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=50)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=51)
 	protected Integer ipPattern; 
-	@ExcelField(title="client_ip",sort=47)
+	@ExcelField(title="client_ip",sort=53)
 	protected String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=46)
+	@ExcelField(title="server_ip",sort=52)
 	protected String destIpAddress;
-	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
+	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=54)
 	protected Integer portPattern;
-	@ExcelField(title="client_port",sort=49)
+	@ExcelField(title="client_port",sort=55)
 	protected String srcPort;
-	@ExcelField(title="server_port",sort=50)
+	@ExcelField(title="server_port",sort=56)
 	protected String destPort; 
 	protected Integer dnsStrategyId; 
-	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=51)
+	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=57)
 	protected Integer irType; 
-	@ExcelField(title="group_name",sort=52)
+	@ExcelField(title="group_name",sort=58)
 	protected String groupName; 
 	
 	private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -75,7 +75,7 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected String organization; //仅用于copy属性使用
 	protected String country; //仅用于copy属性使用
 	protected String detail; //仅用于copy属性使用
-	@ExcelField(title="log_total",sort=31)
+	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
 	
 	public String getOrganization() {
@@ -177,14 +177,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	 */
 	@Expose
 	@SerializedName("direction")
-	@ExcelField(title="direction",dictType="DIRECTION",sort=53)
+	@ExcelField(title="direction",dictType="DIRECTION",sort=58)
 	protected Integer direction ;
 	/**
 	 * 协议
 	 */
 	@Expose
 	@SerializedName("protocol")
-	@ExcelField(title="protocol",dictType="PROTOCOL",sort=54)
+	@ExcelField(title="protocol",dictType="PROTOCOL",sort=59)
 	protected Integer protocol ;
 	/**
 	 * 协议ID
--- a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
@@ -23,29 +23,13 @@ public class DdosIpCfg extends BaseIpCfg {
 	 */
 	private static final long serialVersionUID = -5446903784736960824L;
 	private String indexTable="ddos_ip_cfg";
-	@ExcelField(title="antiddos_protocol",sort=41)
+	@ExcelField(title="antiddos_protocol",sort=46)
 	private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP，
-	@ExcelField(title="bps_threadshold",sort=42)
+	@ExcelField(title="bps_threadshold",sort=47)
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
-	@ExcelField(title="pps_threadshold",sort=43)
+	@ExcelField(title="pps_threadshold",sort=48)
 	private Long ppsThreadshold;
-	@ExcelField(title="log_total",sort=32)
-	private Long totalLogs;	
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=20)
-	private Integer isAudit;
-	
-	public Integer getIsAudit() {
-		return isAudit;
-	}
-	public void setIsAudit(Integer isAudit) {
-		this.isAudit = isAudit;
-	}
-	public Long getTotalLogs() {
-		return totalLogs;
-	}
-	public void setTotalLogs(Long totalLogs) {
-		this.totalLogs = totalLogs;
-	}
+
 	public String getAntiddosProtocol() {
 		return antiddosProtocol;
 	}
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -282,10 +282,10 @@
 									<%-- <th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th> --%>
-									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="label"/></th> --%>									
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -388,12 +388,7 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</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>
@@ -412,6 +407,11 @@
 										</c:choose> --%>
 									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
@@ -401,8 +401,7 @@
 									<th column="address_pool"  class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
 									<th column="ip_total"  class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
 									<th column="available_ip_total" ><spring:message code="available_ip_total"/></th>
-									<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>
-									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>									
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
 									<%-- <th column="whether_area_block" ><spring:message code="whether_area_block"/></th> --%>
 									<th column="operation" ><spring:message code="operation"/></th>
@@ -410,6 +409,7 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
+									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -438,12 +438,7 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</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>
@@ -524,6 +519,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
@@ -353,18 +353,17 @@
 									<th column="translated_dest_port" ><spring:message code="translated_dest_port"/></th>
 									<th column="protocol" ><spring:message code="protocol"/></th>
 									<th column="user_type"><spring:message code="user_type"/></th>
-									<th column="user"><spring:message code="user"/></th>
-									<th column="log_total" ><spring:message code="log_total"/></th>
-									
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
+									<th column="user"><spring:message code="user"/></th>																									
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
 									<%-- <th column="do_log" ><spring:message code="do_log"/></th> --%>
+									<th column="log_total" ><spring:message code="log_total"/></th>
+									<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
 									<%-- <th column="whether_area_block" ><spring:message code="whether_area_block"/></th> --%>
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
+									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>									
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -417,16 +416,14 @@
 											</c:if>
 				              			</c:forEach>
 									</td>
-									
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
-									
+																										
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
+									</td> --%>									
 									<%-- <td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -434,12 +431,7 @@
 													<spring:message code="selective"/>
 												</a>
 										</c:if>
-									</td> --%>
-									<td>
-										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -448,6 +440,8 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 									<td>${indexCfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>
@@ -507,7 +501,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
@@ -331,8 +331,7 @@
 									<th column="user"><spring:message code="user"/></th>
 									<%-- <th column="ip"><spring:message code="ip"/></th> --%>
 									<th column="log_total"><spring:message code="log_total"/></th>
-									<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
-									<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>									
 									<th column="is_audit"><spring:message code="is_audit"/></th>
 									<%-- <th column="do_log"><spring:message code="do_log"/></th> --%>
 									<%-- <th column="whether_area_block"><spring:message code="whether_area_block"/></th> --%>
@@ -340,6 +339,7 @@
 									<th column="classification"><spring:message code="classification"/></th>
 									<th column="attribute"><spring:message code="attribute"/></th>
 									<th column="label"><spring:message code="label"/></th>
+									<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"><spring:message code="creator"/></th>
 									<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"><spring:message code="editor"/></th>
@@ -390,12 +390,7 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
-									<td>
-										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -478,6 +473,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
+									<td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>