1、原始日志查询添加encap_type, link_id, inner_smac, inner_dmac字段；

2、修正NTC关键字转URL日志查询接口bean名称错误问题
2018-10-26 16:54:33 +08:00
parent c9362988f0
commit c0325878e5
3 changed files with 193 additions and 6 deletions
--- a/src/main/java/com/nis/domain/LogEntity.java
+++ b/src/main/java/com/nis/domain/LogEntity.java
@@ -89,6 +89,16 @@ public abstract class LogEntity<T> implements Serializable {
 	@ApiModelProperty(value = "现场日志文件地址", required = true)
 	protected String sceneFile;
 	
+	@ApiModelProperty(value = "串联设备链路号", required = true)
+	protected Long linkId;	
+	@ApiModelProperty(value = "原始二层封装格式", required = true)
+	protected Integer encapType;
+	@ApiModelProperty(value = "MAC_IN_MAC的内层源MAC", required = true)
+	protected String innerSmac;
+	@ApiModelProperty(value = "MAC_IN_MAC的内层目标MAC", required = true)
+	protected String innerDmac;
+	
+	
 	protected String searchCfgId;//配置id
 	protected String searchTransProto;//协议类型
 	protected String searchDIp;//服务端ip地址
@@ -522,4 +532,37 @@ public abstract class LogEntity<T> implements Serializable {
 		return sceneFile;
 	}

+	public Long getLinkId() {
+		return linkId;
+	}
+
+	public void setLinkId(Long linkId) {
+		this.linkId = linkId;
+	}
+
+	public Integer getEncapType() {
+		return encapType;
+	}
+
+	public void setEncapType(Integer encapType) {
+		this.encapType = encapType;
+	}
+
+	public String getInnerSmac() {
+		return innerSmac;
+	}
+
+	public void setInnerSmac(String innerSmac) {
+		this.innerSmac = innerSmac;
+	}
+
+	public String getInnerDmac() {
+		return innerDmac;
+	}
+
+	public void setInnerDmac(String innerDmac) {
+		this.innerDmac = innerDmac;
+	}
+	
+	
 }
--- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
+++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
@@ -1087,23 +1087,23 @@ public class NtcLogSearchController extends BaseRestController {
 		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
 				request, null);
 		
-		Page<NtcStreamingMediaLog> logPage = null;
+		Page<NtcKeywordsUrlLog> logPage = null;
 		try {
 			resetTime(ntcKeywordsUrlLog);
 			ntcLogService.queryConditionCheck(auditLogThread, start, ntcKeywordsUrlLog, NtcKeywordsUrlLog.class, page);
-			logPage = new Page<NtcStreamingMediaLog>();
+			logPage = new Page<NtcKeywordsUrlLog>();
 			logPage.setPageNo(page.getPageNo());
 			logPage.setPageSize(page.getPageSize());
 			String orderBy = "";
 			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
-				orderBy = Page.getOrderBySql(NtcStreamingMediaLog.class.getSimpleName(), page.getOrderBy());
+				orderBy = Page.getOrderBySql(NtcKeywordsUrlLog.class.getSimpleName(), page.getOrderBy());
 			} else {
 				orderBy = "found_Time";
 			}
 			String sql = HiveSqlService.getSql(page, ntcKeywordsUrlLog,
 					getTableName(NtcKeywordsUrlLog.class.getSimpleName() + "HiveTable", "NTC_KEYWORDS_URL_LOG"),
 					getCol2Col(), orderBy, null);
-			Map<String, List<Object>> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamingMediaLog.class, "foundTime",
+			Map<String, List<Object>> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcKeywordsUrlLog.class, "foundTime",
 					"recvTime");
 			if (tableMapping == null) {
 				logPage.setList(new ArrayList());
@@ -1111,8 +1111,8 @@ public class NtcLogSearchController extends BaseRestController {
 				List list = tableMapping.get("obj");
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
-					List<NtcStreamingMediaLog> List = (java.util.List<NtcStreamingMediaLog>) JsonMapper.fromJsonList(jsonString,
-							NtcStreamingMediaLog.class);
+					List<NtcKeywordsUrlLog> List = (java.util.List<NtcKeywordsUrlLog>) JsonMapper.fromJsonList(jsonString,
+							NtcKeywordsUrlLog.class);
 					logPage.setList(List);
 					logPage.setCount(List.size());
 					
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -46,6 +46,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 	</resultMap>

 	<resultMap id="NtcHttpLogMap" type="com.nis.domain.restful.NtcHttpLog">
@@ -73,6 +77,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="req_hdr_file" jdbcType="VARCHAR" property="reqHdrFile" />
@@ -112,6 +120,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="rd" jdbcType="INTEGER" property="rd" />
 		<result column="qr" jdbcType="INTEGER" property="qr" />
@@ -153,6 +165,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="mail_proto" jdbcType="VARCHAR" property="mailProto" />
 		<result column="mail_from" jdbcType="VARCHAR" property="mailFrom" />
@@ -189,6 +205,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="sni" jdbcType="VARCHAR" property="sni" />
@@ -223,6 +243,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
 		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
@@ -255,6 +279,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
 		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
@@ -286,6 +314,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="encrypt_mode" jdbcType="VARCHAR" property="encryptMode" />
@@ -319,6 +351,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="ex_protocol" jdbcType="INTEGER" property="exProtocol" />
 		<result column="isakmp_mode" jdbcType="INTEGER" property="isakmpMode" />
@@ -350,6 +386,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="host_key" jdbcType="VARCHAR" property="hostKey" />
@@ -384,6 +424,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />

 		<result column="ftp_url" jdbcType="VARCHAR" property="ftpUrl" />
 		<result column="ftp_content" jdbcType="VARCHAR" property="ftpContent" />
@@ -414,6 +458,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="label_proto_id" jdbcType="INTEGER" property="labelProtoId" />
 		<result column="label_proto_source" jdbcType="INTEGER" property="labelProtoSource" />
@@ -448,6 +496,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="attack_type" jdbcType="INTEGER" property="attackType" />
 		<result column="attack_start_time" jdbcType="TIMESTAMP" property="attackStartTime" />
@@ -483,6 +535,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="label_proto_id" jdbcType="INTEGER" property="labelProtoId" />
 		<result column="label_os_id" jdbcType="INTEGER" property="labelOsId" />
@@ -519,6 +575,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -553,6 +613,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -587,6 +651,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -621,6 +689,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -656,6 +728,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -697,6 +773,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -739,6 +819,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -774,6 +858,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -808,6 +896,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -842,6 +934,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -876,6 +972,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -911,6 +1011,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -952,6 +1056,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="req_line" jdbcType="VARCHAR" property="reqLine" />
@@ -993,6 +1101,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="p2p_proto" jdbcType="VARCHAR" property="p2pProto" />
 		<result column="p2p_file_id" jdbcType="VARCHAR" property="p2pFileId" />
@@ -1023,6 +1135,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="type" jdbcType="INTEGER" property="type" />
 		<result column="as_num" jdbcType="VARCHAR" property="asNum" />
@@ -1054,6 +1170,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -1088,6 +1208,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -1122,6 +1246,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -1156,6 +1284,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -1190,6 +1322,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
@@ -1220,6 +1356,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -1254,6 +1394,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="link_id" jdbcType="BIGINT" property="linkId" />
+		<result column="encap_type" jdbcType="INTEGER" property="encapType" />
+		<result column="inner_smac" jdbcType="VARCHAR" property="innerSmac" />
+		<result column="inner_dmac" jdbcType="VARCHAR" property="innerDmac" />
 		
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="website" jdbcType="VARCHAR" property="website" />