日志行为识别去掉App_label字段，增加五个标签

LABEL_PROTO_ID
LABEL_OS_ID
LABEL_BS_ID
LABEL_BEHAV_ID
LABEL_APP_ID

src/main/java/com/nis/domain/log/DkBehaviorLog.java

@@ -13,8 +13,13 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
  */
 public class DkBehaviorLog  extends BaseLogEntity<DkBehaviorLog> {
 	private static final long serialVersionUID = -589390375816690510L;
-	@ApiModelProperty(value = "协议标签", required = true)
+	
-    protected String appLabel;
+	protected Integer labelProtoId; //协议类型id
+	protected Integer labelOsId;//操作系统id
+	protected Integer labelBsId; //浏览器id
+	protected Integer labelBehavId; //行为id
+	protected Integer labelAppId; //应用id
+	
     @ApiModelProperty(value = "c2s包数", required = true)
     protected String c2sPktNum;
     @ApiModelProperty(value = "s2c包数", required = true)
@@ -24,11 +29,36 @@ public class DkBehaviorLog  extends BaseLogEntity<DkBehaviorLog> {
     @ApiModelProperty(value = "s2c字节数", required = true)
     protected String s2cByteNum;
     
-	public String getAppLabel() {
+	
-		return appLabel;
+	public Integer getLabelProtoId() {
+		return labelProtoId;
 	}
-	public void setAppLabel(String appLabel) {
+	public void setLabelProtoId(Integer labelProtoId) {
-		this.appLabel = appLabel;
+		this.labelProtoId = labelProtoId;
+	}
+	public Integer getLabelOsId() {
+		return labelOsId;
+	}
+	public void setLabelOsId(Integer labelOsId) {
+		this.labelOsId = labelOsId;
+	}
+	public Integer getLabelBsId() {
+		return labelBsId;
+	}
+	public void setLabelBsId(Integer labelBsId) {
+		this.labelBsId = labelBsId;
+	}
+	public Integer getLabelBehavId() {
+		return labelBehavId;
+	}
+	public void setLabelBehavId(Integer labelBehavId) {
+		this.labelBehavId = labelBehavId;
+	}
+	public Integer getLabelAppId() {
+		return labelAppId;
+	}
+	public void setLabelAppId(Integer labelAppId) {
+		this.labelAppId = labelAppId;
 	}
 	public String getC2sPktNum() {
 		return c2sPktNum;

src/main/resources/messages/message_en.properties

@@ -764,6 +764,7 @@ first_hit=First Hit
 search_error=Search Error
 data_format_error=Data Format Error
 server_internal_error=Server Internal Error
+behavior_protocol=Behavior Protocol
 #===========log end  =============
 #=============about proxy=========
 intercept_policy=Intercept Policy

src/main/resources/messages/message_ru.properties

@@ -681,6 +681,7 @@ attack_total_pkt=Attack Total pkt
 attack_total_byte=Attack Total byte
 is_blcok=Is Blcok
 firstPage=First Page
+behavior_protocol=Behavior Protocol
 #===========log end  =============
 #=============about proxy=========
 intercept_policy=intercept policy

src/main/resources/messages/message_zh_CN.properties

@@ -765,6 +765,7 @@ first_hit=\u9996\u6B21\u5206\u6790\u547D\u4E2D
 search_error=\u67E5\u8BE2\u9519\u8BEF
 data_format_error=\u6570\u636E\u683C\u5F0F\u9519\u8BEF
 server_internal_error=\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF
+behavior_protocol=\u884C\u4E3A\u534F\u8BAE
 #===========log end  =============
 #=============about proxy=========
 intercept_policy=\u62E6\u622A\u7B56\u7565

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -361,5 +361,13 @@
     <function-signature>java.lang.String stringFormat(java.lang.String, int)</function-signature>
     <example>${fns:stringFormat(str,len)}</example>
   </function>
+  <!-- 根据表名取出标签集合 -->
+    <function>
+    <description>根据code的名称取出标签名</description>
+    <name>getCodeList</name>
+    <function-class>com.nis.util.CodeDicUtils</function-class>
+    <function-signature>java.util.List getCodeList(java.lang.String)</function-signature>
+    <example>${fns:getCodeList(str)}</example>
+  </function>
   
 </taglib>

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -162,7 +162,11 @@ $(document).ready(function(){
 									<th><spring:message code='found_time'/></th>
 									<th><spring:message code='entrance'/></th>
 									
-									<th><spring:message code='app_label'/></th>
+									<th><spring:message code='behavior_protocol'/></th>
+									<th><spring:message code='os_type'/></th>
+									<th><spring:message code='browser_type'/></th>
+									<th><spring:message code='behaviour_type'/></th>
+									<th><spring:message code='social_app'/></th>
 									<th><spring:message code='c2s_pkt_num'/></th>
 									<th><spring:message code='s2c_pkt_num'/></th>
 									<th><spring:message code='c2s_byte_num'/></th>
@@ -204,7 +208,39 @@ $(document).ready(function(){
 									</td>
 									
 									<td>
-										${log.appLabel}
+										<c:forEach items="${fns:getCodeList('protocolCode')}" var="dict">
+											<c:if test="${dict.code eq log.labelProtoId}">
+												<spring:message code="${dict.item}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getCodeList('osCode')}" var="dict">
+											<c:if test="${dict.code eq log.labelOsId}">
+												<spring:message code="${dict.item}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getCodeList('browserCode')}" var="dict">
+											<c:if test="${dict.code eq log.labelBsId}">
+												<spring:message code="${dict.item}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getCodeList('behaviorCode')}" var="dict">
+											<c:if test="${dict.code eq log.labelBehavId}">
+												<spring:message code="${dict.item}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getCodeList('appCode')}" var="dict">
+											<c:if test="${dict.code eq log.labelAppId}">
+												<spring:message code="${dict.item}"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>${log.c2sPktNum}</td>
 									<td>${log.s2cPktNum}</td>