diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java
index fd7225d..a471a22 100644
--- a/src/main/java/com/nis/domain/Page.java
+++ b/src/main/java/com/nis/domain/Page.java
@@ -18,7 +18,6 @@ import org.apache.ibatis.mapping.ResultMapping;
 import org.apache.ibatis.session.SqlSessionFactory;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.nis.domain.restful.DfIpPortLog;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.CookieUtil;
@@ -809,6 +808,6 @@ public class Page<T> {
 //		this.list = page.getContent();
 //	
 public static void main(String[] args) {
-	Page page=new Page<DfIpPortLog>();
+//	Page page=new Page<DfIpPortLog>();
 }	
 }
diff --git a/src/main/java/com/nis/web/controller/restful/ServiceController.java b/src/main/java/com/nis/web/controller/restful/ServiceController.java
index 0286c42..05b90d7 100644
--- a/src/main/java/com/nis/web/controller/restful/ServiceController.java
+++ b/src/main/java/com/nis/web/controller/restful/ServiceController.java
@@ -9,30 +9,15 @@
 package com.nis.web.controller.restful;
 
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 import com.nis.domain.ControlLog;
-import com.nis.domain.Page;
-import com.nis.domain.restful.ConfigSource;
-import com.nis.domain.restful.DfIpPortLog;
-import com.nis.restful.RestBusinessCode;
-import com.nis.restful.RestServiceException;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.restful.ControlLogService;
-import com.wordnik.swagger.annotations.ApiOperation;
 
 /** 
 * @ClassName: ServiceController 
diff --git a/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java b/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java
index 0f534a9..861a510 100644
--- a/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java
+++ b/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java
@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServicesRequestLog;
-import com.nis.domain.restful.DfIpPortLog;
 import com.nis.domain.restful.ServicesRequestLogBean;
 import com.nis.restful.RestServiceException;
 import com.nis.util.Constants;
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.java b/src/main/java/com/nis/web/dao/DfLogSearchDao.java
deleted file mode 100644
index 37eb9d8..0000000
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**   
-* @Title: DfLogSearchDao.java 
-* @Package com.nis.web.dao 
-* @Description: TODO(用一句话描述该文件做什么) 
-* @author （ddm）  
-* @date 2016年9月5日 下午44:6:25 
-* @version V1.0   
-*/
-package com.nis.web.dao;
-
-import java.util.List;
-
-
-import com.nis.domain.ControlLog;
-import com.nis.domain.LogEntity;
-import com.nis.domain.restful.DfDnsLog;
-import com.nis.domain.restful.DfFtpLog;
-import com.nis.domain.restful.DfIpsecLog;
-import com.nis.domain.restful.DfL2tpLog;
-import com.nis.domain.restful.DfMailLog;
-import com.nis.domain.restful.DfOpenvpnLog;
-import com.nis.domain.restful.DfPptpLog;
-import com.nis.domain.restful.DfSshLog;
-import com.nis.domain.restful.DfSslLog;
-import com.nis.domain.restful.DfTunnelRandomLog;
-
-/** 
-* @ClassName: DfLogSearchDao 
-* @Description: TODO(这里用一句话描述这个类的作用) 
-* @author (ddm)  
-* @date 2016年9月5日 下午2:6:25 
-* @version V1.0 
-*/
-@MyBatisDao
-public interface DfLogSearchDao extends CrudDao<LogEntity> {
-
-	List<DfMailLog> findMailLogs(DfMailLog log);
-	List<DfDnsLog> findDnsLogs(DfDnsLog log);
-	List<DfFtpLog> findFtpLogs(DfFtpLog log);
-	List<DfPptpLog> findPptpLogs(DfPptpLog log);
-	List<DfL2tpLog> findL2tpLogs(DfL2tpLog log);
-	List<DfIpsecLog> findIpsecLogs(DfIpsecLog log);
-	List<DfOpenvpnLog> findOpenvpnLogs(DfOpenvpnLog log);
-	List<DfSshLog> findSshLogs(DfSshLog log);
-	List<DfSslLog> findSslLogs(DfSslLog log);
-	List<DfTunnelRandomLog> findTunnelRandomLogs(DfTunnelRandomLog log);
-	List<DfMailLog> findMailLogsCluster(DfMailLog log);
-	List<DfDnsLog> findDnsLogsCluster(DfDnsLog log);
-	List<DfFtpLog> findFtpLogsCluster(DfFtpLog log);
-	List<DfPptpLog> findPptpLogsCluster(DfPptpLog log);
-	List<DfL2tpLog> findL2tpLogsCluster(DfL2tpLog log);
-	List<DfIpsecLog> findIpsecLogsCluster(DfIpsecLog log);
-	List<DfOpenvpnLog> findOpenvpnLogsCluster(DfOpenvpnLog log);
-	List<DfSshLog> findSshLogsCluster(DfSshLog log);
-	List<DfSslLog> findSslLogsCluster(DfSslLog log);
-	List<DfTunnelRandomLog> findTunnelRandomLogsCluster(DfTunnelRandomLog log);
-	
-}
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
deleted file mode 100644
index 947004e..0000000
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ /dev/null
@@ -1,1190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nis.web.dao.DfLogSearchDao">
-	<!--  所有日志表的公共属性  -->
-	<sql id="commonPorperty">
-		ID,CFG_ID,FOUND_TIME,RECV_TIME,
-		OVER_ID,PROTOCOL,SERVER_IP,CLIENT_IP,
-		SERVER_PORT,CLIENT_PORT,NEST_PROTOCOL,
-		NEST_SERVER_IP,NEST_CLIENT_IP,NEST_SERVER_PORT,
-		NEST_CLIENT_PORT,SERVICE_TYPE,ENTRANCE_ID,CLJ_IP,
-		SCENE_FILE,ACTION,SERVER_LOCATE,CLIENT_LOCATE,INJECTED_PKT_FILE	
-	</sql>
-	 <resultMap id="DfIpPortLogMap" type="com.nis.domain.restful.DfIpPortLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-	</resultMap>
-	<!-- DF_IP_PORT_LOG日志查询 -->
-	<select id="findIpPortLogs" parameterType="com.nis.domain.restful.DfIpPortLog" resultMap="DfIpPortLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-			</otherwise>
-		</choose>
-		FROM DF_IP_PORT_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_HTTP_REQ_LOG -->
-	<sql id="httpReqProperty">
-		,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,REQ_BODY_FILE,COOKIE,REFERER,UA,USER_DEFINE_KEY,USER_DEFINE_VALUE				
-	</sql>
-	<resultMap id="DfHttpReqLogMap" type="com.nis.domain.restful.DfHttpReqLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="c2s_Isn" jdbcType="BIGINT" property="c2sIsn" />
-		<result column="http_Proxy_Flag" jdbcType="BIGINT" property="httpProxyFlag" />
-		<result column="http_Seq" jdbcType="BIGINT" property="httpSeq" />
-		<result column="url" jdbcType="VARCHAR" property="url" />
-		<result column="req_Line" jdbcType="VARCHAR" property="reqLine" />
-		<result column="req_Hdr_File" jdbcType="VARCHAR" property="reqHdrFile" />
-		<result column="req_Body_File" jdbcType="VARCHAR" property="reqBodyFile" />
-		<result column="COOKIE" jdbcType="VARCHAR" property="cookie" />
-		<result column="REFERER" jdbcType="VARCHAR" property="referer" />
-		<result column="UA" jdbcType="VARCHAR" property="ua" />
-		<result column="USER_DEFINE_KEY" jdbcType="VARCHAR" property="reqUserDefineKey" />
-		<result column="USER_DEFINE_VALUE" jdbcType="VARCHAR" property="reqUserDefineValue" />
-	</resultMap>
-	<select id="findHttpReqLogs" parameterType="com.nis.domain.restful.DfHttpReqLog" resultMap="DfHttpReqLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="httpReqProperty"/>	
-			</otherwise>
-		</choose>
-		FROM DF_HTTP_REQ_LOG
-		<where>
-			
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchUrl != null and searchUrl !=''">
-				AND URL = #{searchUrl}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	
-	<!-- DF_HTTP_RES_LOG -->
-	<sql id="httpResProperty">
-		,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,
-		REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE,SET_COOKIE,
-		CONTENT_LEN,CONTENT_TYPE,USER_DEFINE_KEY,USER_DEFINE_VALUE
-						
-	</sql>
-	<resultMap id="DfHttpResLogMap" type="com.nis.domain.restful.DfHttpResLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		 <result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="C2S_ISN" jdbcType="BIGINT" property="c2sIsn" />
-		<result column="HTTP_PROXY_FLAG" jdbcType="BIGINT" property="httpProxyFlag" />
-		<result column="HTTP_SEQ" jdbcType="BIGINT" property="httpSeq" />
-		<result column="URL" jdbcType="VARCHAR" property="url" />
-		<result column="REQ_LINE" jdbcType="VARCHAR" property="reqLine" />
-		<result column="REQ_HDR_FILE" jdbcType="VARCHAR" property="reqHdrFile" />
-		<result column="REQ_BODY_FILE" jdbcType="VARCHAR" property="reqBodyFile" />
-		<result column="RES_LINE" jdbcType="VARCHAR" property="resLine" />
-		<result column="RES_HDR_FILE" jdbcType="VARCHAR" property="resHdrFile" />
-		<result column="RES_BODY_FILE" jdbcType="VARCHAR" property="resBodyFile" />
-		<result column="SET_COOKIE" jdbcType="VARCHAR" property="setCookie" />
-		<result column="CONTENT_LEN" jdbcType="VARCHAR" property="contentLen" />
-		<result column="CONTENT_TYPE" jdbcType="VARCHAR" property="contentType" />
-		<result column="USER_DEFINE_KEY" jdbcType="VARCHAR" property="resUserDefineKey" />
-		<result column="USER_DEFINE_VALUE" jdbcType="VARCHAR" property="resUserDefineValue" />
-		
-	</resultMap>
-	<select id="findHttpResLogs" parameterType="com.nis.domain.restful.DfHttpResLog" resultMap="DfHttpResLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="httpResProperty"/>	
-			</otherwise>
-		</choose>
-		FROM DF_HTTP_RES_LOG
-		<where>
-			
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchUrl != null and searchUrl !=''">
-				AND URL = #{searchUrl}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_HTTP_Keyword_LOG -->
-	<sql id="httpKeywordProperty">
-		,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,
-		REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE							
-	</sql>
-	<resultMap id="DfHttpKeywordLogMap" type="com.nis.domain.restful.DfHttpKeywordLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		 <result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="C2S_ISN" jdbcType="BIGINT" property="c2sIsn" />
-		<result column="HTTP_PROXY_FLAG" jdbcType="BIGINT" property="httpProxyFlag" />
-		<result column="HTTP_SEQ" jdbcType="BIGINT" property="httpSeq" />
-		<result column="URL" jdbcType="VARCHAR" property="url" />
-		<result column="REQ_LINE" jdbcType="VARCHAR" property="reqLine" />
-		<result column="REQ_HDR_FILE" jdbcType="VARCHAR" property="reqHdrFile" />
-		<result column="REQ_BODY_FILE" jdbcType="VARCHAR" property="reqBodyFile" />
-		<result column="RES_LINE" jdbcType="VARCHAR" property="resLine" />
-		<result column="RES_HDR_FILE" jdbcType="VARCHAR" property="resHdrFile" />
-		<result column="RES_BODY_FILE" jdbcType="VARCHAR" property="resBodyFile" />
-		
-	</resultMap>
-	<select id="findHttpKeywordLogs" parameterType="com.nis.domain.restful.DfHttpKeywordLog" resultMap="DfHttpKeywordLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="httpKeywordProperty"/>	
-			</otherwise>
-		</choose>
-		FROM DF_HTTP_KEYWORD_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchUrl != null and searchUrl !=''">
-				AND URL = #{searchUrl}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_MAIL_LOG -->
-	<sql id="mailProperty">
-		,MAIL_PROTO,MAIL_FROM,MAIL_TO,SUBJECT,EML_FILE					
-	</sql>
-	<resultMap id="DfMailLogMap" type="com.nis.domain.restful.DfMailLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="MAIL_PROTO" jdbcType="VARCHAR" property="mailProto" />
-		<result column="MAIL_FROM" jdbcType="VARCHAR" property="mailFrom" />
-		<result column="MAIL_TO" jdbcType="VARCHAR" property="mailTo" />
-		<result column="SUBJECT" jdbcType="VARCHAR" property="subject" />
-		<result column="EML_FILE" jdbcType="VARCHAR" property="emlFile" />
-	</resultMap>
-	<select id="findMailLogs" parameterType="com.nis.domain.restful.DfMailLog" resultMap="DfMailLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="mailProperty"/>			
-			</otherwise>
-		</choose>
-		FROM DF_MAIL_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchMailFrom != null and searchMailFrom !=''">
-				AND MAIL_FROM = #{searchMailFrom}
-			</if>
-			<if test="searchMailTo != null and searchMailTo !=''">
-				AND MAIL_TO = #{searchMailTo}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_DNS_LOG -->
-	<sql id="dnsProperty">
-		,RD,QTYPE,QCLASS,OPCODE,QNAME,CHEAT_TYPE
-	    ,CHEAT_RCODE,CHEAT_STRATEGY,CHEAT_Rr				
-	</sql>
-	<resultMap id="DfDnsLogMap" type="com.nis.domain.restful.DfDnsLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="rd" jdbcType="BIGINT" property="rd" />
-		<result column="qtype" jdbcType="BIGINT" property="qtype" />
-		<result column="qclass" jdbcType="BIGINT" property="qclass" />
-		<result column="opcode" jdbcType="BIGINT" property="opcode" />
-		<result column="qname" jdbcType="VARCHAR" property="qname" />
-		<result column="cheat_type" jdbcType="VARCHAR" property="cheatType" />
-		<result column="cheat_rcode" jdbcType="BIGINT" property="cheatRcode" />
-		<result column="cheat_strategy" jdbcType="VARCHAR" property="cheatStrategy" />
-		<result column="cheat_rr" jdbcType="VARCHAR" property="cheatRr" />
-	</resultMap>
-	<select id="findDnsLogs" parameterType="com.nis.domain.restful.DfDnsLog" resultMap="DfDnsLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="dnsProperty"/>		
-			</otherwise>
-		</choose>
-		FROM DF_DNS_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_FTP_LOG -->
-	<sql id="ftpProperty">
-		,FTP_URL				
-	</sql>
-	<resultMap id="DfFtpLogMap" type="com.nis.domain.restful.DfFtpLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="ftp_url" jdbcType="VARCHAR" property="ftpUrl" />
-	</resultMap>
-	<select id="findFtpLogs" parameterType="com.nis.domain.restful.DfFtpLog" resultMap="DfFtpLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="ftpProperty"/>		
-			</otherwise>
-		</choose>
-		FROM DF_FTP_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_PPTP_LOG -->
-	<sql id="pptpProperty">
-		,TUNNEL_TYPE,ENCRYPT_MODE,CONTENT_TYPE				
-	</sql>
-	<resultMap id="DfPptpLogMap" type="com.nis.domain.restful.DfPptpLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
-		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
-		<result column="CONTENT_TYPE" jdbcType="INTEGER" property="contentType" />
-	</resultMap>
-	<select id="findPptpLogs" parameterType="com.nis.domain.restful.DfPptpLog" resultMap="DfPptpLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="pptpProperty"/>		
-			</otherwise>
-		</choose>
-		FROM DF_PPTP_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_L2TP_LOG -->
-	<sql id="l2tpProperty">
-		,TUNNEL_TYPE,ENCRYPT_MODE,CHAP_NAME,CONTENT_TYPE			
-	</sql>
-	<resultMap id="DfL2tpLogMap" type="com.nis.domain.restful.DfL2tpLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
-		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
-		<result column="chap_name" jdbcType="VARCHAR" property="chapName" />
-		<result column="CONTENT_TYPE" jdbcType="INTEGER" property="contentType" />
-	</resultMap>
-	<select id="findL2tpLogs" parameterType="com.nis.domain.restful.DfL2tpLog" resultMap="DfL2tpLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="l2tpProperty"/>		
-			</otherwise>
-		</choose>	
-		FROM DF_L2TP_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null  and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_IPSEC_LOG -->
-	<sql id="ipsecProperty">
-		,EX_PROTOCOL,ISAKMP_MODE				
-	</sql>
-	<resultMap id="DfIpsecLogMap" type="com.nis.domain.restful.DfIpsecLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="ex_protocol" jdbcType="INTEGER" property="exProtocol" />
-		<result column="isakmp_mode" jdbcType="INTEGER" property="isakmpMode" />
-	</resultMap>
-	<select id="findIpsecLogs" parameterType="com.nis.domain.restful.DfIpsecLog" resultMap="DfIpsecLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="ipsecProperty"/>		
-			</otherwise>
-		</choose>	
-		FROM DF_IPSEC_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchExProtocol != null and searchExProtocol !=''">
-				AND EX_PROTOCOL = #{searchExProtocol}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_OPENVPN_LOG -->
-	<sql id="openvpnProperty">
-		,VERSION,ENCRYPT_MODE,HMAC,TUNNEL_TYPE			
-	</sql>
-	<resultMap id="DfOpenvpnLogMap" type="com.nis.domain.restful.DfOpenvpnLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="VERSION" jdbcType="VARCHAR" property="version" />
-		<result column="ENCRYPT_MODE" jdbcType="VARCHAR" property="encryptMode" />
-		<result column="HMAC" jdbcType="INTEGER" property="hmac" />
-		<result column="TUNNEL_TYPE" jdbcType="INTEGER" property="tunnelType" />
-	</resultMap>
-	<select id="findOpenvpnLogs" parameterType="com.nis.domain.restful.DfOpenvpnLog" resultMap="DfOpenvpnLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="openvpnProperty"/>		
-			</otherwise>
-		</choose>	
-		FROM DF_OPENVPN_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_SSH_LOG -->
-	<sql id="sshProperty">
-		,VERSION,HOST_KEY,HOST_COOKIE,ENCRYPT_MODE,MAC,TUNNEL_TYPE				
-	</sql>
-	<resultMap id="DfSshLogMap" type="com.nis.domain.restful.DfSshLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		 <result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="VERSION" jdbcType="VARCHAR" property="version" />
-		<result column="HOST_KEY" jdbcType="VARCHAR" property="hostKey" />
-		<result column="HOST_COOKIE" jdbcType="VARCHAR" property="hostCookie" />
-		<result column="ENCRYPT_MODE" jdbcType="VARCHAR" property="encryptMode" />
-		<result column="MAC" jdbcType="VARCHAR" property="mac" />
-		<result column="TUNNEL_TYPE" jdbcType="INTEGER" property="tunnelType" />
-	</resultMap>
-	<select id="findSshLogs" parameterType="com.nis.domain.restful.DfSshLog" resultMap="DfSshLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="sshProperty"/>		
-			</otherwise>
-		</choose>
-		FROM DF_SSH_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_SSL_LOG -->
-	<sql id="sslProperty">
-		,VERSION,SNI,INDIVIDUAL_CERT_FILE,MIDDLE_CERT_FILE,ROOT_CERT_FILE,CHAIN_CERT_FILE			
-	</sql>
-	<resultMap id="DfSslLogMap" type="com.nis.domain.restful.DfSslLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="VERSION" jdbcType="VARCHAR" property="version" />
-		<result column="SNI" jdbcType="VARCHAR" property="sni" />
-		<result column="INDIVIDUAL_CERT_FILE" jdbcType="VARCHAR" property="individualCertFile" />
-		<result column="MIDDLE_CERT_FILE" jdbcType="VARCHAR" property="middleCertFile" />
-		<result column="ROOT_CERT_FILE" jdbcType="VARCHAR" property="rootCertFile" />
-		<result column="CHAIN_CERT_FILE" jdbcType="VARCHAR" property="chainCertFile" />
-	</resultMap>
-	<select id="findSslLogs" parameterType="com.nis.domain.restful.DfSslLog" resultMap="DfSslLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="sslProperty"/>	
-			</otherwise>
-		</choose>
-		FROM DF_SSL_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-	<!-- DF_TUNNEL_RANDOM_LOG -->
-	<sql id="tunnelRandomProperty">
-		,TUNNEL_NAME			
-	</sql>
-	<resultMap id="DfTunnelRandomLogMap" type="com.nis.domain.restful.DfTunnelRandomLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
-		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="TUNNEL_NAME" jdbcType="INTEGER" property="tunnelName" />
-	</resultMap>
-	<select id="findTunnelRandomLogs" parameterType="com.nis.domain.restful.DfTunnelRandomLog" resultMap="DfTunnelRandomLogMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="tunnelRandomProperty"/>	
-			</otherwise>
-		</choose>
-		FROM DF_TUNNEL_RANDOM_LOG
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= to_date(#{searchFoundStartTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < to_date(#{searchFoundEndTime},'yyyy-MM-dd HH24:mi:ss')]]>
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-		</choose>
-	</select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.java b/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.java
deleted file mode 100644
index 5d8ce75..0000000
--- a/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**   
-* @Title: DfLogSearchDao.java 
-* @Package com.nis.web.dao 
-* @Description: TODO(用一句话描述该文件做什么) 
-* @author （ddm）  
-* @date 2016年9月5日 下午44:6:25 
-* @version V1.0   
-*/
-package com.nis.web.dao;
-
-import java.util.List;
-
-
-import com.nis.domain.ControlLog;
-import com.nis.domain.LogEntity;
-import com.nis.domain.restful.DfDnsLog;
-import com.nis.domain.restful.DfFtpLog;
-import com.nis.domain.restful.DfIpsecLog;
-import com.nis.domain.restful.DfL2tpLog;
-import com.nis.domain.restful.DfMailLog;
-import com.nis.domain.restful.DfOpenvpnLog;
-import com.nis.domain.restful.DfPptpLog;
-import com.nis.domain.restful.DfSshLog;
-import com.nis.domain.restful.DfSslLog;
-import com.nis.domain.restful.DfTunnelRandomLog;
-
-/** 
-* @ClassName: DfLogSearchDao 
-* @Description: TODO(这里用一句话描述这个类的作用) 
-* @author (ddm)  
-* @date 2016年9月5日 下午2:6:25 
-* @version V1.0 
-*/
-@MyBatisDao
-public interface DfLogSearchDaoCluster extends CrudDao<LogEntity> {
-
-	List<DfMailLog> findMailLogsCluster(DfMailLog log);
-	List<DfDnsLog> findDnsLogsCluster(DfDnsLog log);
-	List<DfFtpLog> findFtpLogsCluster(DfFtpLog log);
-	List<DfPptpLog> findPptpLogsCluster(DfPptpLog log);
-	List<DfL2tpLog> findL2tpLogsCluster(DfL2tpLog log);
-	List<DfIpsecLog> findIpsecLogsCluster(DfIpsecLog log);
-	List<DfOpenvpnLog> findOpenvpnLogsCluster(DfOpenvpnLog log);
-	List<DfSshLog> findSshLogsCluster(DfSshLog log);
-	List<DfSslLog> findSslLogsCluster(DfSslLog log);
-	List<DfTunnelRandomLog> findTunnelRandomLogsCluster(DfTunnelRandomLog log);
-	
-}
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml b/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml
deleted file mode 100644
index b19c6b0..0000000
--- a/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml
+++ /dev/null
@@ -1,1120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nis.web.dao.DfLogSearchDaoCluster">
-	<!--  所有日志表的公共属性  -->
-	<sql id="commonPorperty">
-		CFG_ID,FOUND_TIME,RECV_TIME,
-		OVER_ID,PROTOCOL,SERVER_IP,CLIENT_IP,
-		SERVER_PORT,CLIENT_PORT,NEST_PROTOCOL,
-		NEST_SERVER_IP,NEST_CLIENT_IP,NEST_SERVER_PORT,
-		NEST_CLIENT_PORT,SERVICE_TYPE,ENTRANCE_ID,CLJ_IP,
-		SCENE_FILE,ACTION,SERVER_LOCATE,CLIENT_LOCATE,INJECTED_PKT_FILE	
-	</sql>
-	 <resultMap id="DfIpPortLogClusterMap" type="com.nis.domain.restful.DfIpPortLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-	</resultMap>
-	<!-- DF_IP_PORT_LOG日志查询 -->
-	<select id="findIpPortLogsCluster" parameterType="com.nis.domain.restful.DfIpPortLog" resultMap="DfIpPortLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_HTTP_REQ_LOG -->
-	<sql id="httpReqProperty">
-		,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,REQ_BODY_FILE,COOKIE,REFERER,UA,USER_DEFINE_KEY,USER_DEFINE_VALUE				
-	</sql>
-	<resultMap id="DfHttpReqLogClusterMap" type="com.nis.domain.restful.DfHttpReqLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="c2s_Isn" jdbcType="BIGINT" property="c2sIsn" />
-		<result column="http_Proxy_Flag" jdbcType="BIGINT" property="httpProxyFlag" />
-		<result column="http_Seq" jdbcType="BIGINT" property="httpSeq" />
-		<result column="url" jdbcType="VARCHAR" property="url" />
-		<result column="req_Line" jdbcType="VARCHAR" property="reqLine" />
-		<result column="req_Hdr_File" jdbcType="VARCHAR" property="reqHdrFile" />
-		<result column="req_Body_File" jdbcType="VARCHAR" property="reqBodyFile" />
-		<result column="COOKIE" jdbcType="VARCHAR" property="cookie" />
-		<result column="REFERER" jdbcType="VARCHAR" property="referer" />
-		<result column="UA" jdbcType="VARCHAR" property="ua" />
-		<result column="USER_DEFINE_KEY" jdbcType="VARCHAR" property="reqUserDefineKey" />
-		<result column="USER_DEFINE_VALUE" jdbcType="VARCHAR" property="reqUserDefineValue" />
-	</resultMap>
-	<select id="findHttpReqLogsCluster" parameterType="com.nis.domain.restful.DfHttpReqLog" resultMap="DfHttpReqLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="httpReqProperty"/>	
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchUrl != null and searchUrl !=''">
-				AND URL = #{searchUrl}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	
-	<!-- DF_HTTP_RES_LOG -->
-	<sql id="httpResProperty">
-		,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,
-		REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE,SET_COOKIE,
-		CONTENT_LEN,CONTENT_TYPE,USER_DEFINE_KEY,USER_DEFINE_VALUE
-						
-	</sql>
-	<resultMap id="DfHttpResLogClusterMap" type="com.nis.domain.restful.DfHttpResLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		 <result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="C2S_ISN" jdbcType="BIGINT" property="c2sIsn" />
-		<result column="HTTP_PROXY_FLAG" jdbcType="BIGINT" property="httpProxyFlag" />
-		<result column="HTTP_SEQ" jdbcType="BIGINT" property="httpSeq" />
-		<result column="URL" jdbcType="VARCHAR" property="url" />
-		<result column="REQ_LINE" jdbcType="VARCHAR" property="reqLine" />
-		<result column="REQ_HDR_FILE" jdbcType="VARCHAR" property="reqHdrFile" />
-		<result column="REQ_BODY_FILE" jdbcType="VARCHAR" property="reqBodyFile" />
-		<result column="RES_LINE" jdbcType="VARCHAR" property="resLine" />
-		<result column="RES_HDR_FILE" jdbcType="VARCHAR" property="resHdrFile" />
-		<result column="RES_BODY_FILE" jdbcType="VARCHAR" property="resBodyFile" />
-		<result column="SET_COOKIE" jdbcType="VARCHAR" property="setCookie" />
-		<result column="CONTENT_LEN" jdbcType="VARCHAR" property="contentLen" />
-		<result column="CONTENT_TYPE" jdbcType="VARCHAR" property="contentType" />
-		<result column="USER_DEFINE_KEY" jdbcType="VARCHAR" property="resUserDefineKey" />
-		<result column="USER_DEFINE_VALUE" jdbcType="VARCHAR" property="resUserDefineValue" />
-		
-	</resultMap>
-	<select id="findHttpResLogsCluster" parameterType="com.nis.domain.restful.DfHttpResLog" resultMap="DfHttpResLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="httpResProperty"/>	
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchUrl != null and searchUrl !=''">
-				AND URL = #{searchUrl}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_HTTP_Keyword_LOG -->
-	<sql id="httpKeywordProperty">
-		,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,
-		REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE							
-	</sql>
-	<resultMap id="DfHttpKeywordLogClusterMap" type="com.nis.domain.restful.DfHttpKeywordLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		 <result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="C2S_ISN" jdbcType="BIGINT" property="c2sIsn" />
-		<result column="HTTP_PROXY_FLAG" jdbcType="BIGINT" property="httpProxyFlag" />
-		<result column="HTTP_SEQ" jdbcType="BIGINT" property="httpSeq" />
-		<result column="URL" jdbcType="VARCHAR" property="url" />
-		<result column="REQ_LINE" jdbcType="VARCHAR" property="reqLine" />
-		<result column="REQ_HDR_FILE" jdbcType="VARCHAR" property="reqHdrFile" />
-		<result column="REQ_BODY_FILE" jdbcType="VARCHAR" property="reqBodyFile" />
-		<result column="RES_LINE" jdbcType="VARCHAR" property="resLine" />
-		<result column="RES_HDR_FILE" jdbcType="VARCHAR" property="resHdrFile" />
-		<result column="RES_BODY_FILE" jdbcType="VARCHAR" property="resBodyFile" />
-		
-	</resultMap>
-	<select id="findHttpKeywordLogsCluster" parameterType="com.nis.domain.restful.DfHttpKeywordLog" resultMap="DfHttpKeywordLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="httpKeywordProperty"/>	
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchUrl != null and searchUrl !=''">
-				AND URL = #{searchUrl}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_MAIL_LOG -->
-	<sql id="mailProperty">
-		,MAIL_PROTO,MAIL_FROM,MAIL_TO,SUBJECT,EML_FILE					
-	</sql>
-	<resultMap id="DfMailLogClusterMap" type="com.nis.domain.restful.DfMailLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="MAIL_PROTO" jdbcType="VARCHAR" property="mailProto" />
-		<result column="MAIL_FROM" jdbcType="VARCHAR" property="mailFrom" />
-		<result column="MAIL_TO" jdbcType="VARCHAR" property="mailTo" />
-		<result column="SUBJECT" jdbcType="VARCHAR" property="subject" />
-		<result column="EML_FILE" jdbcType="VARCHAR" property="emlFile" />
-	</resultMap>
-	<select id="findMailLogsCluster" parameterType="com.nis.domain.restful.DfMailLog" resultMap="DfMailLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="mailProperty"/>			
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchMailFrom != null and searchMailFrom !=''">
-				AND MAIL_FROM = #{searchMailFrom}
-			</if>
-			<if test="searchMailTo != null and searchMailTo !=''">
-				AND MAIL_TO = #{searchMailTo}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_DNS_LOG -->
-	<sql id="dnsProperty">
-		,RD,QTYPE,QCLASS,OPCODE,QNAME,CHEAT_TYPE
-	    ,CHEAT_RCODE,CHEAT_STRATEGY,CHEAT_Rr				
-	</sql>
-	<resultMap id="DfDnsLogClusterMap" type="com.nis.domain.restful.DfDnsLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="rd" jdbcType="BIGINT" property="rd" />
-		<result column="qtype" jdbcType="BIGINT" property="qtype" />
-		<result column="qclass" jdbcType="BIGINT" property="qclass" />
-		<result column="opcode" jdbcType="BIGINT" property="opcode" />
-		<result column="qname" jdbcType="VARCHAR" property="qname" />
-		<result column="cheat_type" jdbcType="VARCHAR" property="cheatType" />
-		<result column="cheat_rcode" jdbcType="BIGINT" property="cheatRcode" />
-		<result column="cheat_strategy" jdbcType="VARCHAR" property="cheatStrategy" />
-		<result column="cheat_rr" jdbcType="VARCHAR" property="cheatRr" />
-	</resultMap>
-	<select id="findDnsLogsCluster" parameterType="com.nis.domain.restful.DfDnsLog" resultMap="DfDnsLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="dnsProperty"/>		
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_FTP_LOG -->
-	<sql id="ftpProperty">
-		,FTP_URL				
-	</sql>
-	<resultMap id="DfFtpLogClusterMap" type="com.nis.domain.restful.DfFtpLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="ftp_url" jdbcType="VARCHAR" property="ftpUrl" />
-	</resultMap>
-	<select id="findFtpLogsCluster" parameterType="com.nis.domain.restful.DfFtpLog" resultMap="DfFtpLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="ftpProperty"/>		
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_PPTP_LOG -->
-	<sql id="pptpProperty">
-		,TUNNEL_TYPE,ENCRYPT_MODE,CONTENT_TYPE				
-	</sql>
-	<resultMap id="DfPptpLogClusterMap" type="com.nis.domain.restful.DfPptpLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
-		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
-		<result column="CONTENT_TYPE" jdbcType="INTEGER" property="contentType" />
-	</resultMap>
-	<select id="findPptpLogsCluster" parameterType="com.nis.domain.restful.DfPptpLog" resultMap="DfPptpLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="pptpProperty"/>		
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_L2TP_LOG -->
-	<sql id="l2tpProperty">
-		,TUNNEL_TYPE,ENCRYPT_MODE,CHAP_NAME,CONTENT_TYPE			
-	</sql>
-	<resultMap id="DfL2tpLogClusterMap" type="com.nis.domain.restful.DfL2tpLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
-		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
-		<result column="chap_name" jdbcType="VARCHAR" property="chapName" />
-		<result column="CONTENT_TYPE" jdbcType="INTEGER" property="contentType" />
-	</resultMap>
-	<select id="findL2tpLogsCluster" parameterType="com.nis.domain.restful.DfL2tpLog" resultMap="DfL2tpLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="l2tpProperty"/>		
-			</otherwise>
-		</choose>	
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null  and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_IPSEC_LOG -->
-	<sql id="ipsecProperty">
-		,EX_PROTOCOL,ISAKMP_MODE				
-	</sql>
-	<resultMap id="DfIpsecLogClusterMap" type="com.nis.domain.restful.DfIpsecLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="ex_protocol" jdbcType="INTEGER" property="exProtocol" />
-		<result column="isakmp_mode" jdbcType="INTEGER" property="isakmpMode" />
-	</resultMap>
-	<select id="findIpsecLogsCluster" parameterType="com.nis.domain.restful.DfIpsecLog" resultMap="DfIpsecLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="ipsecProperty"/>		
-			</otherwise>
-		</choose>	
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchExProtocol != null and searchExProtocol !=''">
-				AND EX_PROTOCOL = #{searchExProtocol}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_OPENVPN_LOG -->
-	<sql id="openvpnProperty">
-		,VERSION,ENCRYPT_MODE,HMAC,TUNNEL_TYPE			
-	</sql>
-	<resultMap id="DfOpenvpnLogClusterMap" type="com.nis.domain.restful.DfOpenvpnLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="VERSION" jdbcType="VARCHAR" property="version" />
-		<result column="ENCRYPT_MODE" jdbcType="VARCHAR" property="encryptMode" />
-		<result column="HMAC" jdbcType="INTEGER" property="hmac" />
-		<result column="TUNNEL_TYPE" jdbcType="INTEGER" property="tunnelType" />
-	</resultMap>
-	<select id="findOpenvpnLogsCluster" parameterType="com.nis.domain.restful.DfOpenvpnLog" resultMap="DfOpenvpnLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="openvpnProperty"/>		
-			</otherwise>
-		</choose>	
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_SSH_LOG -->
-	<sql id="sshProperty">
-		,VERSION,HOST_KEY,HOST_COOKIE,ENCRYPT_MODE,MAC,TUNNEL_TYPE				
-	</sql>
-	<resultMap id="DfSshLogClusterMap" type="com.nis.domain.restful.DfSshLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		 <result column="over_Id" jdbcType="VARCHAR" property="overId" /> 
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="VERSION" jdbcType="VARCHAR" property="version" />
-		<result column="HOST_KEY" jdbcType="VARCHAR" property="hostKey" />
-		<result column="HOST_COOKIE" jdbcType="VARCHAR" property="hostCookie" />
-		<result column="ENCRYPT_MODE" jdbcType="VARCHAR" property="encryptMode" />
-		<result column="MAC" jdbcType="VARCHAR" property="mac" />
-		<result column="TUNNEL_TYPE" jdbcType="INTEGER" property="tunnelType" />
-	</resultMap>
-	<select id="findSshLogsCluster" parameterType="com.nis.domain.restful.DfSshLog" resultMap="DfSshLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="sshProperty"/>		
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchEncryptMode != null and searchEncryptMode !=''">
-				AND ENCRYPT_MODE = #{searchEncryptMode}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_SSL_LOG -->
-	<sql id="sslProperty">
-		,VERSION,SNI,INDIVIDUAL_CERT_FILE,MIDDLE_CERT_FILE,ROOT_CERT_FILE,CHAIN_CERT_FILE			
-	</sql>
-	<resultMap id="DfSslLogClusterMap" type="com.nis.domain.restful.DfSslLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="VERSION" jdbcType="VARCHAR" property="version" />
-		<result column="SNI" jdbcType="VARCHAR" property="sni" />
-		<result column="INDIVIDUAL_CERT_FILE" jdbcType="VARCHAR" property="individualCertFile" />
-		<result column="MIDDLE_CERT_FILE" jdbcType="VARCHAR" property="middleCertFile" />
-		<result column="ROOT_CERT_FILE" jdbcType="VARCHAR" property="rootCertFile" />
-		<result column="CHAIN_CERT_FILE" jdbcType="VARCHAR" property="chainCertFile" />
-	</resultMap>
-	<select id="findSslLogsCluster" parameterType="com.nis.domain.restful.DfSslLog" resultMap="DfSslLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="sslProperty"/>	
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-	<!-- DF_TUNNEL_RANDOM_LOG -->
-	<sql id="tunnelRandomProperty">
-		,TUNNEL_NAME			
-	</sql>
-	<resultMap id="DfTunnelRandomLogClusterMap" type="com.nis.domain.restful.DfTunnelRandomLog">
-		<result column="id" jdbcType="BIGINT" property="id" />
-		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
-		<result column="found_Time" jdbcType="BIGINT" property="foundTimeCluster" />
-		<result column="recv_Time" jdbcType="BIGINT" property="recvTimeCluster" />
-		<result column="over_Id" jdbcType="VARCHAR" property="overId" />
-		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
-		<result column="server_Ip" jdbcType="VARCHAR" property="serverIp" />
-		<result column="client_Ip" jdbcType="VARCHAR" property="clientIp" />
-		<result column="server_Port" jdbcType="INTEGER" property="serverPort" />
-		<result column="client_Port" jdbcType="INTEGER" property="clientPort" />
-		<result column="nest_Protocol" jdbcType="VARCHAR" property="nestProtocol" />
-		<result column="nest_Server_Ip" jdbcType="VARCHAR" property="nestServerIp" />
-		<result column="nest_Client_Ip" jdbcType="VARCHAR" property="nestClientIp" />
-		<result column="nest_Server_Port" jdbcType="INTEGER" property="nestServerPort" />
-		<result column="nest_Client_Port" jdbcType="INTEGER" property="nestClientPort" />
-		<result column="service_Type" jdbcType="INTEGER" property="serviceType" />
-		<result column="entrance_Id" jdbcType="BIGINT" property="entranceId" />
-		<result column="clj_Ip" jdbcType="VARCHAR" property="cljIp" />
-		<result column="SCENE_FILE" jdbcType="VARCHAR" property="sceneFile" />
-		<result column="action" jdbcType="INTEGER" property="action" />
-		<result column="server_Locate" jdbcType="VARCHAR" property="serverLocate" />
-		<result column="client_Locate" jdbcType="VARCHAR" property="clientLocate" />
-		<result column="INJECTED_PKT_FILE" jdbcType="VARCHAR" property="injectedPktFile" />
-		<result column="TUNNEL_NAME" jdbcType="INTEGER" property="tunnelName" />
-	</resultMap>
-	<select id="findTunnelRandomLogsCluster" parameterType="com.nis.domain.restful.DfTunnelRandomLog" resultMap="DfTunnelRandomLogClusterMap">
-		SELECT
-		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when>
-			<otherwise>
-				<include refid="commonPorperty"/>	
-				<include refid="tunnelRandomProperty"/>	
-			</otherwise>
-		</choose>
-		FROM ${tableName}
-		<where>
-			<if test="searchServiceType != null and searchServiceType !=''">
-				AND SERVICE_TYPE = #{searchServiceType}
-			</if>
-			<if test="searchProtocol != null and searchProtocol !=''">
-				AND PROTOCOL = #{searchProtocol}
-			</if>
-			<if test="searchServerIp != null and searchServerIp !=''">
-				AND SERVER_IP = #{searchServerIp}
-			</if>
-			<if test="searchClientIp != null and searchClientIp !=''">
-				AND CLIENT_IP = #{searchClientIp}
-			</if>
-			<if test="searchEntranceId != null and searchEntranceId !=''">
-				AND ENTRANCE_ID = #{searchEntranceId}
-			</if>
-			<if test="searchCljIp != null and searchCljIp !=''">
-				AND CLJ_IP = #{searchCljIp}
-			</if>
-			<if test="searchCfgId != null and searchCfgId !=''">
-				AND CFG_ID =#{searchCfgId}
-			</if>
-			<if test="searchFoundStartTime != null and searchFoundStartTime !=''">
-				<![CDATA[AND FOUND_TIME >= ${searchFoundStartTimeCluster}]]>
-			</if>
-			<if test="searchFoundEndTime != null and searchFoundEndTime !=''">
-				<![CDATA[AND FOUND_TIME < ${searchFoundEndTimeCluster}]]>
-			</if>
-		</where>
-	</select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/restful/DfLogSearchService.java b/src/main/java/com/nis/web/service/restful/DfLogSearchService.java
deleted file mode 100644
index 360cacc..0000000
--- a/src/main/java/com/nis/web/service/restful/DfLogSearchService.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/**   
-* @Title: DfLogSearchService.java 
-* @Package com.nis.web.service.restful 
-* @Description: TODO(用一句话描述该文件做什么) 
-* @author （ddm）  
-* @date 2016年9月15日 下午2:08:12 
-* @version V1.0   
-*/
-package com.nis.web.service.restful;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.text.ParseException;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import org.apache.http.client.ClientProtocolException;
-import org.json.JSONException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.nis.domain.LogEntity;
-import com.nis.domain.Page;
-import com.nis.domain.restful.DfDnsLog;
-import com.nis.domain.restful.DfFtpLog;
-import com.nis.domain.restful.DfIpsecLog;
-import com.nis.domain.restful.DfL2tpLog;
-import com.nis.domain.restful.DfMailLog;
-import com.nis.domain.restful.DfOpenvpnLog;
-import com.nis.domain.restful.DfPptpLog;
-import com.nis.domain.restful.DfSshLog;
-import com.nis.domain.restful.DfSslLog;
-import com.nis.domain.restful.DfTunnelRandomLog;
-//import com.nis.util.MysqlJDBC;
-import com.nis.util.Constants;
-import com.nis.web.dao.DfLogSearchDao;
-import com.nis.web.dao.DfLogSearchDaoCluster;
-import com.nis.web.service.BaseLogService;
-
-/** 
-* @ClassName: DfLogSearchService 
-* @Description: TODO(这里用一句话描述这个类的作用) 
-* @author (ddm)  
-* @date 2016年9月5日 下午2:08:12 
-* @version V1.0 
-*/
-@Service
-public class DfLogSearchService extends BaseLogService{
-	protected final Logger logger = Logger.getLogger(this.getClass());
-	/**
-	 * 持久层对象
-	 */
-	@Autowired
-	protected DfLogSearchDao dao;
-	@Autowired
-	protected DfLogSearchDaoCluster daoCluster;
-	
-	/**
-	 * 获取单条数据
-	 * @param id
-	 * @return
-	 */
-	public LogEntity get(Long id) {
-		return dao.get(id);
-	}
-	
-	/**
-	 * 获取单条数据
-	 * @param entity
-	 * @return
-	 */
-	public LogEntity get(LogEntity entity) {
-		return dao.get(entity);
-	}
-	
-	/**
-	 * 查询列表数据
-	 * @param entity
-	 * @return
-	 */
-	public List<LogEntity> findList(LogEntity entity) {
-		return dao.findList(entity);
-	}
-
-
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfMailLog> findMailPage(Page<DfMailLog> page, DfMailLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfMailLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findMailLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfDnsLog> findDnsPage(Page<DfDnsLog> page, DfDnsLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfDnsLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findDnsLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfFtpLog> findFtpPage(Page<DfFtpLog> page, DfFtpLog entity,String activeSys) throws SQLException, IllegalArgumentException, IllegalAccessException, ClientProtocolException, ParseException, JSONException, IOException {
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfFtpLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findFtpLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfPptpLog> findPptpPage(Page<DfPptpLog> page, DfPptpLog entity,String activeSys) throws Exception {
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfPptpLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findPptpLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfL2tpLog> findL2tpPage(Page<DfL2tpLog> page, DfL2tpLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfL2tpLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findL2tpLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfIpsecLog> findIpsecPage(Page<DfIpsecLog> page, DfIpsecLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfIpsecLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findIpsecLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfOpenvpnLog> findOpenvpnPage(Page<DfOpenvpnLog> page, DfOpenvpnLog entity,String activeSys) throws Exception {
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfOpenvpnLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findOpenvpnLogs(entity));
-		}
-		return page;
-	}
-	
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfSshLog> findSshPage(Page<DfSshLog> page, DfSshLog entity,String activeSys) throws Exception {
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfSshLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findSshLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfSslLog> findSslPage(Page<DfSslLog> page, DfSslLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfSslLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-		page.setList(dao.findSslLogs(entity));
-		}
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfTunnelRandomLog> findTunnelRandomPage(Page<DfTunnelRandomLog> page, DfTunnelRandomLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		if(Constants.IS_USE_ES){
-			List<DfTunnelRandomLog> resultList=new ArrayList<>();
-			elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
-			page.setList(resultList);
-		}else{
-			page.setList(dao.findTunnelRandomLogs(entity));
-		}
-		return page;
-	}
-	
-	
-
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfMailLog> findMailPageCluster(Page<DfMailLog> page, DfMailLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		page.setList(daoCluster.findMailLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfDnsLog> findDnsPageCluster(Page<DfDnsLog> page, DfDnsLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		page.setList(daoCluster.findDnsLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfFtpLog> findFtpPageCluster(Page<DfFtpLog> page, DfFtpLog entity,String activeSys) throws SQLException, IllegalArgumentException, IllegalAccessException, ClientProtocolException, ParseException, JSONException, IOException {
-		entity.setPage(page);
-		page.setList(daoCluster.findFtpLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfPptpLog> findPptpPageCluster(Page<DfPptpLog> page, DfPptpLog entity,String activeSys) throws Exception {
-		entity.setPage(page);
-		page.setList(daoCluster.findPptpLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfL2tpLog> findL2tpPageCluster(Page<DfL2tpLog> page, DfL2tpLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		page.setList(daoCluster.findL2tpLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfIpsecLog> findIpsecPageCluster(Page<DfIpsecLog> page, DfIpsecLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		page.setList(daoCluster.findIpsecLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfOpenvpnLog> findOpenvpnPageCluster(Page<DfOpenvpnLog> page, DfOpenvpnLog entity,String activeSys) throws Exception {
-		entity.setPage(page);
-		page.setList(daoCluster.findOpenvpnLogsCluster(entity));
-		return page;
-	}
-	
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfSshLog> findSshPageCluster(Page<DfSshLog> page, DfSshLog entity,String activeSys) throws Exception {
-		entity.setPage(page);
-		page.setList(daoCluster.findSshLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfSslLog> findSslPageCluster(Page<DfSslLog> page, DfSslLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		page.setList(daoCluster.findSslLogsCluster(entity));
-		return page;
-	}
-	/**
-	 * 查询分页数据
-	 * @param page 分页对象
-	 * @param entity
-	 * @return
-	 * @throws Exception 
-	 */
-	public Page<DfTunnelRandomLog> findTunnelRandomPageCluster(Page<DfTunnelRandomLog> page, DfTunnelRandomLog entity,String activeSys)  throws Exception{
-		entity.setPage(page);
-		page.setList(daoCluster.findTunnelRandomLogsCluster(entity));
-		return page;
-	}
-	
-}