From 0762498e013871e9760b1eb30b0230bd45cd083a Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@intranet.com>
Date: Tue, 24 Jul 2018 17:08:29 +0800
Subject: [PATCH] =?UTF-8?q?VOIP=E6=97=A5=E5=BF=97=E8=A1=A8voip=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=94=B1protocol=E6=94=B9=E4=B8=BAvoipProtocol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/domain/restful/MmSampleVoipLog.java    | 18 +++++++++++-------
 .../nis/domain/restful/MmVoipAccountLog.java   | 16 +++++++++++-----
 .../com/nis/domain/restful/MmVoipIpLog.java    | 16 +++++++++++-----
 .../java/com/nis/web/dao/DfLogSearchDao.xml    |  6 +++---
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java b/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java
index 7caf940..afa40fb 100644
--- a/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java
+++ b/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java
@@ -15,7 +15,7 @@ public class MmSampleVoipLog extends LogEntity<MmSampleVoipLog> {
 	@ApiModelProperty(value = "VOIP通话时长（秒）", required = true)
 	protected String duation;
 	@ApiModelProperty(value = "VOIP协议", required = true)
-	protected String protocol;
+	protected String voipProtocol;
 	@ApiModelProperty(value = "主叫VOIP账号", required = true)
 	protected String callingAccount;
 	@ApiModelProperty(value = "被叫VOIP账号", required = true)
@@ -64,13 +64,17 @@ public class MmSampleVoipLog extends LogEntity<MmSampleVoipLog> {
 	public void setFdType(Integer fdType) {
 		this.fdType = fdType;
 	}
-
-	public String getProtocol() {
-		return protocol;
+	/**
+	 * @return the voipProtocol
+	 */
+	public String getVoipProtocol() {
+		return voipProtocol;
 	}
-
-	public void setProtocol(String protocol) {
-		this.protocol = protocol;
+	/**
+	 * @param voipProtocol the voipProtocol to set
+	 */
+	public void setVoipProtocol(String voipProtocol) {
+		this.voipProtocol = voipProtocol;
 	}
 
 	public String getDuation() {
diff --git a/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java b/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java
index 7b85045..e0b0dfe 100644
--- a/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java
+++ b/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java
@@ -18,7 +18,7 @@ public class MmVoipAccountLog  extends LogEntity<MmVoipAccountLog> {
     @ApiModelProperty(value="VOIP通话时长（秒）", required=true)
     protected String duation;
     @ApiModelProperty(value="VOIP协议", required=true)
-    protected String protocol;
+    protected String voipProtocol;
     @ApiModelProperty(value="主叫VOIP账号", required=true)
     protected String callingAccount;
     @ApiModelProperty(value="被叫VOIP账号", required=true)
@@ -62,11 +62,17 @@ public class MmVoipAccountLog  extends LogEntity<MmVoipAccountLog> {
 	public void setFdType(Integer fdType) {
 		this.fdType = fdType;
 	}
-	public String getProtocol() {
-		return protocol;
+	/**
+	 * @return the voipProtocol
+	 */
+	public String getVoipProtocol() {
+		return voipProtocol;
 	}
-	public void setProtocol(String protocol) {
-		this.protocol = protocol;
+	/**
+	 * @param voipProtocol the voipProtocol to set
+	 */
+	public void setVoipProtocol(String voipProtocol) {
+		this.voipProtocol = voipProtocol;
 	}
 	public String getDuation() {
 		return duation;
diff --git a/src/main/java/com/nis/domain/restful/MmVoipIpLog.java b/src/main/java/com/nis/domain/restful/MmVoipIpLog.java
index ffa8a9d..3f8fbe5 100644
--- a/src/main/java/com/nis/domain/restful/MmVoipIpLog.java
+++ b/src/main/java/com/nis/domain/restful/MmVoipIpLog.java
@@ -18,7 +18,7 @@ public class MmVoipIpLog  extends LogEntity<MmVoipIpLog> {
     @ApiModelProperty(value="VOIP通话时长（秒）", required=true)
     protected String duation;
     @ApiModelProperty(value="VOIP协议", required=true)
-    protected String protocol;
+    protected String voipProtocol;
     @ApiModelProperty(value="主叫VOIP账号", required=true)
     protected String callingAccount;
     @ApiModelProperty(value="被叫VOIP账号", required=true)
@@ -62,11 +62,17 @@ public class MmVoipIpLog  extends LogEntity<MmVoipIpLog> {
 	public void setFdType(Integer fdType) {
 		this.fdType = fdType;
 	}
-	public String getProtocol() {
-		return protocol;
+	/**
+	 * @return the voipProtocol
+	 */
+	public String getVoipProtocol() {
+		return voipProtocol;
 	}
-	public void setProtocol(String protocol) {
-		this.protocol = protocol;
+	/**
+	 * @param voipProtocol the voipProtocol to set
+	 */
+	public void setVoipProtocol(String voipProtocol) {
+		this.voipProtocol = voipProtocol;
 	}
 	public String getDuation() {
 		return duation;
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
index 6cfa2d2..1aad9a7 100644
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -549,7 +549,7 @@
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
 		<result column="calling_account" jdbcType="VARCHAR" property="callingAccount" />
 		<result column="called_account" jdbcType="VARCHAR" property="calledAccount" />
 		<result column="calling_number" jdbcType="VARCHAR" property="callingNumber" />
@@ -585,7 +585,7 @@
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
 		<result column="calling_account" jdbcType="VARCHAR" property="callingAccount" />
 		<result column="called_account" jdbcType="VARCHAR" property="calledAccount" />
 		<result column="calling_number" jdbcType="VARCHAR" property="callingNumber" />
@@ -769,7 +769,7 @@
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
 		<result column="calling_account" jdbcType="VARCHAR" property="callingAccount" />
 		<result column="called_account" jdbcType="VARCHAR" property="calledAccount" />
 		<result column="calling_number" jdbcType="VARCHAR" property="callingNumber" />