From ecb332df641d68bf08e78268bf8c75f0ed79b813 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 18 May 2018 10:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BaseIpCfg=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4src/dst=E7=9B=B8=E5=85=B3=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=8C=E6=96=B0=E5=A2=9Eip/port=20pattern,ip/port?=
 =?UTF-8?q?=20address?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/domain/configuration/BaseIpCfg.java   | 225 +++++-------------
 1 file changed, 62 insertions(+), 163 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
index ce2cb2758..965b710ab 100644
--- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
@@ -40,54 +40,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@Expose
 	@SerializedName("ipType")
 	protected Integer ipType;
-	/**
-	 * 源IP地址
-	 */
-	@Expose
-	@SerializedName("srcIp")
-	protected String srcIp ;
-	/**
-	 * 源地址掩码
-	 */
-	@Expose
-	@SerializedName("srcIpMask")
-	protected String srcIpMask ;
-	/**
-	 * 源端口
-	 */
-	@Expose
-	@SerializedName("srcPort")
-	protected String srcPort ;
-	/**
-	 * 源端口掩码
-	 */
-	@Expose
-	@SerializedName("srcPortMask")
-	protected String srcPortMask ;
-	/**
-	 * 目的IP地址
-	 */
-	@Expose
-	@SerializedName("dstIp")
-	protected String dstIp ;
-	/**
-	 * 目的地址掩码
-	 */
-	@Expose
-	@SerializedName("dstIpMask")
-	protected String dstIpMask ;
-	/**
-	 * 目的端口
-	 */
-	@Expose
-	@SerializedName("dstPort")
-	protected String dstPort ;
-	/**
-	 * 目的端口掩码
-	 */
-	@Expose
-	@SerializedName("dstPortMask")
-	protected String dstPortMask ;
+	protected Integer ipPattern; 
+	protected String ipAddress; 
+	protected Integer portPattern; 
+	protected String port; 
+	
 	/**
 	 * 方向
 	 */
@@ -120,118 +77,7 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	public void setIpType(Integer ipType) {
 		this.ipType = ipType;
 	}
-	/**
-	 * srcIp
-	 * @return  srcIp
-	*/
 	
-	public String getSrcIp() {
-		return srcIp;
-	}
-	/**
-	 * @param srcIp the srcIp to set
-	 */
-	public void setSrcIp(String srcIp) {
-		this.srcIp = srcIp;
-	}
-	/**
-	 * srcIpMask
-	 * @return  srcIpMask
-	*/
-	
-	public String getSrcIpMask() {
-			return srcIpMask;
-	}
-	/**
-	 * @param srcIpMask the srcIpMask to set
-	 */
-	public void setSrcIpMask(String srcIpMask) {
-		this.srcIpMask = srcIpMask;
-	}
-	/**
-	 * srcPort
-	 * @return  srcPort
-	*/
-	
-	public String getSrcPort() {
-		return srcPort;
-	}
-	/**
-	 * @param srcPort the srcPort to set
-	 */
-	public void setSrcPort(String srcPort) {
-		this.srcPort = srcPort;
-	}
-	/**
-	 * srcPortMask
-	 * @return  srcPortMask
-	*/
-	
-	public String getSrcPortMask() {
-		return srcPortMask;
-	}
-	/**
-	 * @param srcPortMask the srcPortMask to set
-	 */
-	public void setSrcPortMask(String srcPortMask) {
-		this.srcPortMask = srcPortMask;
-	}
-	/**
-	 * dstIp
-	 * @return  dstIp
-	*/
-	
-	public String getDstIp() {
-		return dstIp;
-	}
-	/**
-	 * @param dstIp the dstIp to set
-	 */
-	public void setDstIp(String dstIp) {
-		this.dstIp = dstIp;
-	}
-	/**
-	 * dstIpMask
-	 * @return  dstIpMask
-	*/
-	
-	public String getDstIpMask() {
-			return dstIpMask;
-	}
-	/**
-	 * @param dstIpMask the dstIpMask to set
-	 */
-	public void setDstIpMask(String dstIpMask) {
-		this.dstIpMask = dstIpMask;
-	}
-	/**
-	 * dstPort
-	 * @return  dstPort
-	*/
-	
-	public String getDstPort() {
-		return dstPort;
-	}
-	/**
-	 * @param dstPort the dstPort to set
-	 */
-	public void setDstPort(String dstPort) {
-		this.dstPort = dstPort;
-	}
-	/**
-	 * dstPortMask
-	 * @return  dstPortMask
-	*/
-	
-	public String getDstPortMask() {
-		return dstPortMask;
-	}
-	/**
-	 * @param dstPortMask the dstPortMask to set
-	 */
-	public void setDstPortMask(String dstPortMask) {
-		this.dstPortMask = dstPortMask;
-	}
 	/**
 	 * direction
 	 * @return  direction
@@ -274,13 +120,66 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	public void setProtocolId(Integer protocolId) {
 		this.protocolId = protocolId;
 	}
+	
+	/**
+	 * ipPattern
+	 * @return  ipPattern
+	*/
+	
+	public Integer getIpPattern() {
+		return ipPattern;
+	}
+	/**
+	 * @param ipPattern the ipPattern to set
+	 */
+	public void setIpPattern(Integer ipPattern) {
+		this.ipPattern = ipPattern;
+	}
+	/**
+	 * ipAddress
+	 * @return  ipAddress
+	*/
+	
+	public String getIpAddress() {
+		return ipAddress;
+	}
+	/**
+	 * @param ipAddress the ipAddress to set
+	 */
+	public void setIpAddress(String ipAddress) {
+		this.ipAddress = ipAddress;
+	}
+	/**
+	 * portPattern
+	 * @return  portPattern
+	*/
+	
+	public Integer getPortPattern() {
+		return portPattern;
+	}
+	/**
+	 * @param portPattern the portPattern to set
+	 */
+	public void setPortPattern(Integer portPattern) {
+		this.portPattern = portPattern;
+	}
+	/**
+	 * port
+	 * @return  port
+	*/
+	
+	public String getPort() {
+		return port;
+	}
+	/**
+	 * @param port the port to set
+	 */
+	public void setPort(String port) {
+		this.port = port;
+	}
 	@Override
 	public void initDefaultValue(){
 		super.initDefaultValue();
-//		this.srcIp ="0.0.0.0";
-		this.srcPortMask = "65535" ;
-//		this.dstIp = "0.0.0.0" ;
-		this.dstPortMask = "65535";
 		this.direction = 0;
 	}