From 94e6da5e337995700e3d93e8b0262373b68555b9 Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac>
Date: Wed, 10 Oct 2018 17:49:00 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81BGP=20=E6=97=A5=E5=BF=97=E4=B8=ADas?=
 =?UTF-8?q?=5Fnumber=E5=AD=97=E6=AE=B5=E6=94=B9=E5=90=8D=E4=B8=BAas=5Fnum;?=
 =?UTF-8?q?=202=E3=80=81=E8=A1=A5=E5=85=A8=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=9C=A8clickhouse=E4=B8=AD=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=85=B3=E7=B3=BB=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/NtcBgpLog.java    | 10 +++++-----
 src/main/java/com/nis/web/dao/DfLogSearchDao.xml       |  4 ++++
 .../resources/applicationLog-clickhouse.properties     |  7 ++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/NtcBgpLog.java b/src/main/java/com/nis/domain/restful/NtcBgpLog.java
index ddfe970..0a84fcf 100644
--- a/src/main/java/com/nis/domain/restful/NtcBgpLog.java
+++ b/src/main/java/com/nis/domain/restful/NtcBgpLog.java
@@ -17,7 +17,7 @@ public class NtcBgpLog extends LogEntity<NtcBgpLog> {
     @ApiModelProperty(value="BGP消息类型", required=true)
     protected Integer type;
     @ApiModelProperty(value="自治系统号", required=true)
-    protected String asNumber;
+    protected String asNum;
     @ApiModelProperty(value="路由信息", required=true)
     protected String route;
     
@@ -27,11 +27,11 @@ public class NtcBgpLog extends LogEntity<NtcBgpLog> {
     public Integer getType() {
 		return type;
 	}
-    public void setAsNumber(String asNumber) {
-    	this.asNumber = asNumber;
+    public void setAsNum(String asNum) {
+    	this.asNum = asNum;
     }
-    public String getAsNumber() {
-		return asNumber;
+    public String getAsNum() {
+		return asNum;
 	}
     public void setRoute(String route) {
 		this.route = route;
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
index 29c4739..fcc6907 100644
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -1022,6 +1022,10 @@
 		<result column="s_subscribe_id" jdbcType="VARCHAR" property="sSubscribeId" />
 		<result column="d_subscribe_id" jdbcType="VARCHAR" property="dSubscribeId" />
 		<result column="scene_file" jdbcType="VARCHAR" property="sceneFile" />
+		
+		<result column="type" jdbcType="INTEGER" property="type" />
+		<result column="as_num" jdbcType="VARCHAR" property="asNum" />
+		<result column="route" jdbcType="VARCHAR" property="route" />
 	</resultMap>
 	
 	<resultMap id="MmLogoDetectionLogMap" type="com.nis.domain.restful.MmLogoDetectionLog">
diff --git a/src/main/resources/applicationLog-clickhouse.properties b/src/main/resources/applicationLog-clickhouse.properties
index d137f4c..a10364e 100644
--- a/src/main/resources/applicationLog-clickhouse.properties
+++ b/src/main/resources/applicationLog-clickhouse.properties
@@ -28,7 +28,12 @@ MmPornVideoLevelLogClickHouseTable=TBS_ODS_MM_PORN_VIDEO_LEVEL_LOG
 MmSamplePicLogClickHouseTable=TBS_ODS_MM_SAMPLE_PIC_LOG
 MmSampleVoipLogClickHouseTable=TBS_ODS_MM_SAMPLE_VOIP_LOG
 PxyHttpLogClickHouseTable=TBS_ODS_PXY_HTTP_LOG
-
+MmFaceRecognizationLogClickHouseTable=TBS_ODS_MM_FACE_RECOGNIZATION_LOG
+MmLogoDetectionLogClickHouseTable=TBS_ODS_MM_LOGO_DETECTION_LOG
+MmSpeakerRecognizationLogClickHouseTable=TBS_ODS_MM_SPEAKER_RECOGNIZATION_LOG
+NtcVoipLogClickHouseTable=TBS_ODS_NTC_VOIP_LOG
+NtcStreamMediaLogClickHouseTable=TBS_ODS_NTC_STREAM_MEDIA_LOG
+MmFileDigestLogClickHouseTable=TBS_ODS_MM_FILE_DIGEST_LOG