From 818356db6acd0a3a70b4f76283faeb7f451ccb55 Mon Sep 17 00:00:00 2001
From: RenKaiGe-Office <RenKaiGe-Office@renkaige-office>
Date: Tue, 14 Aug 2018 16:44:47 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"DK=5FBEHAVIOR=5FLOG=20app=5Flabel,?=
 =?UTF-8?q?=E6=8B=86=E5=88=865=E4=B8=AA=E5=B1=9E=E6=80=A7"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0d564693bbd675641f7d23613a7641951764f728.
---
 .../com/nis/domain/restful/DkBehaviorLog.java | 79 ++-----------------
 .../java/com/nis/web/dao/DfLogSearchDao.xml   |  6 +-
 2 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java
index 6c5c4c2..285e8a1 100644
--- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java
+++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java
@@ -12,18 +12,8 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
  */
 public class DkBehaviorLog  extends LogEntity<DkBehaviorLog> {
 	private static final long serialVersionUID = -589390375816690510L;
-
-	@ApiModelProperty(value = "协议类型ID", required = true)
-    protected Integer labelProtoId;
-	@ApiModelProperty(value = "操作系统ID", required = true)
-    protected Integer labelOsId;
-	@ApiModelProperty(value = "浏览器ID", required = true)
-    protected Integer labelBsId;
-	@ApiModelProperty(value = "行为ID", required = true)
-    protected Integer labelBehavId;
-	@ApiModelProperty(value = "应用ID", required = true)
-    protected Integer labelAppId;
-	
+	@ApiModelProperty(value = "协议标签", required = true)
+    protected String appLabel;
 	@ApiModelProperty(value = "c2s包数", required = true)
     protected String c2sPktNum;
     @ApiModelProperty(value = "s2c包数", required = true)
@@ -32,69 +22,12 @@ public class DkBehaviorLog  extends LogEntity<DkBehaviorLog> {
     protected String c2sByteNum;
     @ApiModelProperty(value = "s2c字节数", required = true)
     protected String s2cByteNum;
-	
-    /**
-	 * @param labelAppId the labelAppId to set
-	 */
-	public void setLabelAppId(Integer labelAppId) {
-		this.labelAppId = labelAppId;
+	public String getAppLabel() {
+		return appLabel;
 	}
-	/**
-	 * @return the labelAppId
-	 */
-	public Integer getLabelAppId() {
-		return labelAppId;
+	public void setAppLabel(String appLabel) {
+		this.appLabel = appLabel;
 	}
-	/**
-	 * @param labelBehavId the labelBehavId to set
-	 */
-	public void setLabelBehavId(Integer labelBehavId) {
-		this.labelBehavId = labelBehavId;
-	}
-	/**
-	 * @return the labelBehavId
-	 */
-	public Integer getLabelBehavId() {
-		return labelBehavId;
-	}
-	/**
-	 * @param labelBsId the labelBsId to set
-	 */
-	public void setLabelBsId(Integer labelBsId) {
-		this.labelBsId = labelBsId;
-	}
-	/**
-	 * @return the labelBsId
-	 */
-	public Integer getLabelBsId() {
-		return labelBsId;
-	}
-	/**
-	 * @param labelOsId the labelOsId to set
-	 */
-	public void setLabelOsId(Integer labelOsId) {
-		this.labelOsId = labelOsId;
-	}
-	/**
-	 * @return the labelOsId
-	 */
-	public Integer getLabelOsId() {
-		return labelOsId;
-	}
-	/**
-	 * @param labelProtoId the labelProtoId to set
-	 */
-	public void setLabelProtoId(Integer labelProtoId) {
-		this.labelProtoId = labelProtoId;
-	}
-	
-	/**
-	 * @return the labelProtoId
-	 */
-	public Integer getLabelProtoId() {
-		return labelProtoId;
-	}
-	
 	public String getC2sPktNum() {
 		return c2sPktNum;
 	}
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
index fbf5027..f28af09 100644
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -443,11 +443,7 @@
 		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
 		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
-		<result column="label_proto_id" jdbcType="INTEGER" property="labelProtoId" />
-		<result column="label_os_id" jdbcType="INTEGER" property="labelOsId" />
-		<result column="label_bs_id" jdbcType="INTEGER" property="labelBsId" />
-		<result column="label_behav_id" jdbcType="INTEGER" property="labelBehavId" />
-		<result column="label_app_id" jdbcType="INTEGER" property="labelAppId" />
+		<result column="app_label" jdbcType="VARCHAR" property="appLabel" />
 		<result column="c2s_pkt_num" jdbcType="VARCHAR" property="c2sPktNum" />
 		<result column="s2c_pkt_num" jdbcType="VARCHAR" property="s2cPktNum" />
 		<result column="c2s_byte_num" jdbcType="VARCHAR" property="c2sByteNum" />