From c026c6d54b5d4e704a7643e177761b338440889a Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac>
Date: Tue, 16 Oct 2018 12:00:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81pxy=5Fhttp=5Flog=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?web=5Fsite=E6=94=B9=E4=B8=BAwebsite;=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9NTC=5FSTREAM=5FMEDIA=5FLOG=E8=A1=A8=E5=90=8D=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BANTC=5FSTREAMING=5FMEDIA=5FLOG=E5=90=8E=E6=9C=AA?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/restful/PxyHttpLog.java   | 10 +++++-----
 .../web/controller/restful/NtcLogSearchController.java |  2 +-
 src/main/java/com/nis/web/dao/DfLogSearchDao.xml       |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/PxyHttpLog.java b/src/main/java/com/nis/domain/restful/PxyHttpLog.java
index c21c159..1a13ab4 100644
--- a/src/main/java/com/nis/domain/restful/PxyHttpLog.java
+++ b/src/main/java/com/nis/domain/restful/PxyHttpLog.java
@@ -40,7 +40,7 @@ public class PxyHttpLog  extends LogEntity<PxyHttpLog> {
     @ApiModelProperty(value="原始应答体", required=true)
     protected String respBody;
     @ApiModelProperty(value="域名", required=true)
-    protected String webSite;
+    protected String website;
     
 	public String getUrl() {
 		return url;
@@ -120,11 +120,11 @@ public class PxyHttpLog  extends LogEntity<PxyHttpLog> {
 	public void setRespBody(String respBody) {
 		this.respBody = respBody;
 	}
-	public String getWebSite() {
-		return webSite;
+	public String getWebsite() {
+		return website;
 	}
 	
-	public void setWebSite(String webSite) {
-		this.webSite = webSite;
+	public void setWebsite(String website) {
+		this.website = website;
 	}
 }
diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
index 77679bf..54e57fe 100644
--- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
+++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
@@ -1047,7 +1047,7 @@ public class NtcLogSearchController extends BaseRestController {
 				orderBy = "found_Time";
 			}
 			String sql = HiveSqlService.getSql(page, ntcStreamMediaLog,
-					getTableName(NtcStreamingMediaLog.class.getSimpleName() + "HiveTable", "NTC_STREAM_MEDIA_LOG"),
+					getTableName(NtcStreamingMediaLog.class.getSimpleName() + "HiveTable", "NTC_STREAMING_MEDIA_LOG"),
 					getCol2Col(), orderBy, null);
 			Map<String, List<Object>> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamingMediaLog.class, "foundTime",
 					"recvTime");
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
index de4a2e1..5d1a72d 100644
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -966,7 +966,7 @@
 		<result column="resp_header" jdbcType="VARCHAR" property="respHeader" />
 		<result column="req_body" jdbcType="VARCHAR" property="reqBody" />
 		<result column="resp_body" jdbcType="VARCHAR" property="respBody" />
-		<result column="web_site" jdbcType="VARCHAR" property="webSite" />
+		<result column="website" jdbcType="VARCHAR" property="website" />
 	</resultMap>
 	<resultMap id="NtcP2pLogMap" type="com.nis.domain.restful.NtcP2pLog">
 		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
@@ -1165,7 +1165,7 @@
 		<result column="called_number" jdbcType="VARCHAR" property="calledNumber" />
 	</resultMap>
 	
-	<resultMap id="NtcStreamMediaLogMap" type="com.nis.domain.restful.NtcStreamingMediaLog">
+	<resultMap id="NtcStreamingMediaLogMap" type="com.nis.domain.restful.NtcStreamingMediaLog">
 		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
 		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
 		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />