1. 将VOIP日志查询接口拆分成VOIP IP和VOIP Account两个日志查询接口；

2.	添加音频样例、视频样例、音频色情、视频色情、图片样例和VOIP样例日志查询接口；

src/main/java/com/nis/domain/restful/MmPornAudioLevelLog.java

@@ -0,0 +1,71 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+/**
+ * @ClassName:MmPornAudioLevelLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月23日 下午5:55:24
+ * @version V1.0
+ */
+public class MmPornAudioLevelLog  extends LogEntity<MmPornAudioLevelLog> {
+
+	private static final long serialVersionUID = -1029807414734744424L;
+	@ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="节目访问地址", required=true)
+    protected String url;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="入口页面", required=true)
+    protected String refer;
+    @ApiModelProperty(value="有害级别", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    @ApiModelProperty(value="协议", required=true)
+    protected String protocol;
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

src/main/java/com/nis/domain/restful/MmPornVideoLevelLog.java

@@ -0,0 +1,72 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName:MmPornVideoLevelLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月23日 下午5:56:55
+ * @version V1.0
+ */
+public class MmPornVideoLevelLog  extends LogEntity<MmPornVideoLevelLog> {
+
+	private static final long serialVersionUID = 7070319067827869009L;
+	@ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="节目访问地址", required=true)
+    protected String url;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="入口页面", required=true)
+    protected String refer;
+    @ApiModelProperty(value="有害级别", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    @ApiModelProperty(value="协议", required=true)
+    protected String protocol;
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

src/main/java/com/nis/domain/restful/MmSampleAudioLog.java

@@ -0,0 +1,71 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+/**
+ * @ClassName:MmSampleAudioLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月23日 下午5:44:27
+ * @version V1.0
+ */
+public class MmSampleAudioLog  extends LogEntity<MmSampleAudioLog> {
+
+	private static final long serialVersionUID = 1493596444530546486L;
+	@ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="节目访问地址", required=true)
+    protected String url;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="入口页面", required=true)
+    protected String refer;
+    @ApiModelProperty(value="有害级别", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    @ApiModelProperty(value="协议", required=true)
+    protected String protocol;
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

src/main/java/com/nis/domain/restful/MmSamplePicLog.java

@@ -0,0 +1,71 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName:MmSamplePicLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月24日 上午9:21:19
+ * @version V1.0
+ */
+public class MmSamplePicLog  extends LogEntity<MmSamplePicLog> {
+	private static final long serialVersionUID = -452630606801144954L;
+	@ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="节目访问地址", required=true)
+    protected String url;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="入口页面", required=true)
+    protected String refer;
+    @ApiModelProperty(value="有害级别", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    @ApiModelProperty(value="协议", required=true)
+    protected String protocol;
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

src/main/java/com/nis/domain/restful/MmSampleVideoLog.java

@@ -0,0 +1,71 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+/**
+ * @ClassName:MmSampleVideoLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月23日 下午5:54:44
+ * @version V1.0
+ */
+public class MmSampleVideoLog  extends LogEntity<MmSampleVideoLog> {
+
+	private static final long serialVersionUID = 855353869282748191L;
+	@ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="节目访问地址", required=true)
+    protected String url;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="入口页面", required=true)
+    protected String refer;
+    @ApiModelProperty(value="有害级别", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    @ApiModelProperty(value="协议", required=true)
+    protected String protocol;
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

src/main/java/com/nis/domain/restful/MmSampleVoipLog.java

@@ -0,0 +1,156 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName:MmSampleVoipLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月24日 上午9:22:20
+ * @version V1.0
+ */
+public class MmSampleVoipLog extends LogEntity<MmSampleVoipLog> {
+	private static final long serialVersionUID = -8661194970990105184L;
+	@ApiModelProperty(value = "VOIP通话时长（秒）", required = true)
+	protected String duation;
+	@ApiModelProperty(value = "VOIP协议", required = true)
+	protected String protocol;
+	@ApiModelProperty(value = "主叫VOIP账号", required = true)
+	protected String callingAccount;
+	@ApiModelProperty(value = "被叫VOIP账号", required = true)
+	protected String calledAccount;
+	@ApiModelProperty(value = "VOIP主叫电信号码", required = true)
+	protected String callingNumber;
+	@ApiModelProperty(value = "VOIP被叫电信号码", required = true)
+	protected String calledNumber;
+	@ApiModelProperty(value = "主叫VOIP语音文件存放服务器IP", required = true)
+	protected String fromToStoreIp;
+	@ApiModelProperty(value = "主叫VOIP语音文件存放服务器URL", required = true)
+	protected String fromToStoreUrl;
+	@ApiModelProperty(value = "被叫VOIP语音文件存放服务器IP", required = true)
+	protected String toFromStoreIp;
+	@ApiModelProperty(value = "被叫VOIP语音文件存放服务器URL", required = true)
+	protected String toFromStoreUrl;
+	@ApiModelProperty(value = "节目ID", required = true)
+	protected String pid;
+	@ApiModelProperty(value = "封堵现场片段路径", required = true)
+	protected String logUri;
+	@ApiModelProperty(value = "封堵类型", required = true)
+	protected Integer level;
+	@ApiModelProperty(value = "封堵类型", required = true)
+	protected Integer fdType;
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	public String getLogUri() {
+		return logUri;
+	}
+
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+
+	public Integer getFdType() {
+		return fdType;
+	}
+
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+
+	public String getProtocol() {
+		return protocol;
+	}
+
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+
+	public String getDuation() {
+		return duation;
+	}
+
+	public void setDuation(String duation) {
+		this.duation = duation;
+	}
+
+	public String getCallingAccount() {
+		return callingAccount;
+	}
+
+	public void setCallingAccount(String callingAccount) {
+		this.callingAccount = callingAccount;
+	}
+
+	public String getCalledAccount() {
+		return calledAccount;
+	}
+
+	public void setCalledAccount(String calledAccount) {
+		this.calledAccount = calledAccount;
+	}
+
+	public String getCallingNumber() {
+		return callingNumber;
+	}
+
+	public void setCallingNumber(String callingNumber) {
+		this.callingNumber = callingNumber;
+	}
+
+	public String getCalledNumber() {
+		return calledNumber;
+	}
+
+	public void setCalledNumber(String calledNumber) {
+		this.calledNumber = calledNumber;
+	}
+
+	public String getFromToStoreIp() {
+		return fromToStoreIp;
+	}
+
+	public void setFromToStoreIp(String fromToStoreIp) {
+		this.fromToStoreIp = fromToStoreIp;
+	}
+
+	public String getFromToStoreUrl() {
+		return fromToStoreUrl;
+	}
+
+	public void setFromToStoreUrl(String fromToStoreUrl) {
+		this.fromToStoreUrl = fromToStoreUrl;
+	}
+
+	public String getToFromStoreIp() {
+		return toFromStoreIp;
+	}
+
+	public void setToFromStoreIp(String toFromStoreIp) {
+		this.toFromStoreIp = toFromStoreIp;
+	}
+
+	public String getToFromStoreUrl() {
+		return toFromStoreUrl;
+	}
+
+	public void setToFromStoreUrl(String toFromStoreUrl) {
+		this.toFromStoreUrl = toFromStoreUrl;
+	}
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+}

src/main/java/com/nis/domain/restful/MmVoipAccountLog.java

@@ -0,0 +1,132 @@
+package com.nis.domain.restful;
+
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName:MmVoipIpLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年7月16日 下午2:57:12
+ * @version V1.0
+ */
+public class MmVoipAccountLog  extends LogEntity<MmVoipAccountLog> {
+
+	private static final long serialVersionUID = -6131067803206270492L;
+//	@ApiModelProperty(value="VOIP接收时间", required=true)
+//  protected String recvTime;
+    @ApiModelProperty(value="VOIP通话时长（秒）", required=true)
+    protected String duation;
+    @ApiModelProperty(value="VOIP协议", required=true)
+    protected String protocol;
+    @ApiModelProperty(value="主叫VOIP账号", required=true)
+    protected String callingAccount;
+    @ApiModelProperty(value="被叫VOIP账号", required=true)
+    protected String calledAccount;
+    @ApiModelProperty(value="VOIP主叫电信号码", required=true)
+    protected String callingNumber;
+    @ApiModelProperty(value="VOIP被叫电信号码", required=true)
+    protected String calledNumber;
+    @ApiModelProperty(value="主叫VOIP语音文件存放服务器IP", required=true)
+    protected String fromToStoreIp;
+    @ApiModelProperty(value="主叫VOIP语音文件存放服务器URL", required=true)
+    protected String fromToStoreUrl;
+    @ApiModelProperty(value="被叫VOIP语音文件存放服务器IP", required=true)
+    protected String toFromStoreIp;
+    @ApiModelProperty(value="被叫VOIP语音文件存放服务器URL", required=true)
+    protected String toFromStoreUrl;
+    @ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+	public String getDuation() {
+		return duation;
+	}
+	public void setDuation(String duation) {
+		this.duation = duation;
+	}
+	public String getCallingAccount() {
+		return callingAccount;
+	}
+	public void setCallingAccount(String callingAccount) {
+		this.callingAccount = callingAccount;
+	}
+	public String getCalledAccount() {
+		return calledAccount;
+	}
+	public void setCalledAccount(String calledAccount) {
+		this.calledAccount = calledAccount;
+	}
+	public String getCallingNumber() {
+		return callingNumber;
+	}
+	public void setCallingNumber(String callingNumber) {
+		this.callingNumber = callingNumber;
+	}
+	public String getCalledNumber() {
+		return calledNumber;
+	}
+	public void setCalledNumber(String calledNumber) {
+		this.calledNumber = calledNumber;
+	}
+	public String getFromToStoreIp() {
+		return fromToStoreIp;
+	}
+	public void setFromToStoreIp(String fromToStoreIp) {
+		this.fromToStoreIp = fromToStoreIp;
+	}
+	public String getFromToStoreUrl() {
+		return fromToStoreUrl;
+	}
+	public void setFromToStoreUrl(String fromToStoreUrl) {
+		this.fromToStoreUrl = fromToStoreUrl;
+	}
+	public String getToFromStoreIp() {
+		return toFromStoreIp;
+	}
+	public void setToFromStoreIp(String toFromStoreIp) {
+		this.toFromStoreIp = toFromStoreIp;
+	}
+	public String getToFromStoreUrl() {
+		return toFromStoreUrl;
+	}
+	public void setToFromStoreUrl(String toFromStoreUrl) {
+		this.toFromStoreUrl = toFromStoreUrl;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	
+}

src/main/java/com/nis/domain/restful/MmVoipIpLog.java

@@ -10,7 +10,7 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
  * @date 2018年7月16日 下午2:57:12
  * @version V1.0
  */
-public class MmVoipLog  extends LogEntity<MmVoipLog> {
+public class MmVoipIpLog  extends LogEntity<MmVoipIpLog> {
 
 	private static final long serialVersionUID = -6131067803206270492L;
 //	@ApiModelProperty(value="VOIP接收时间", required=true)

src/main/java/com/nis/web/controller/restful/LogController.java

@@ -23,7 +23,14 @@ import com.nis.domain.restful.MmAvIpLog;
 import com.nis.domain.restful.MmAvUrlLog;
 import com.nis.domain.restful.MmPicIpLog;
 import com.nis.domain.restful.MmPicUrlLog;
-import com.nis.domain.restful.MmVoipLog;
+import com.nis.domain.restful.MmPornAudioLevelLog;
+import com.nis.domain.restful.MmPornVideoLevelLog;
+import com.nis.domain.restful.MmSampleAudioLog;
+import com.nis.domain.restful.MmSamplePicLog;
+import com.nis.domain.restful.MmSampleVideoLog;
+import com.nis.domain.restful.MmSampleVoipLog;
+import com.nis.domain.restful.MmVoipAccountLog;
+import com.nis.domain.restful.MmVoipIpLog;
 import com.nis.domain.restful.NtcAppLog;
 import com.nis.domain.restful.NtcAttrTypeReport;
 import com.nis.domain.restful.NtcDdosLog;
@@ -984,14 +991,14 @@ public class LogController extends BaseRestController {
 			logPage.setPageSize(page.getPageSize());
 			String orderBy = "";
 			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
-				orderBy = Page.getOrderBySql(MmAvIpLog.class.getSimpleName(), page.getOrderBy());
+				orderBy = Page.getOrderBySql(MmAvUrlLog.class.getSimpleName(), page.getOrderBy());
 			} else {
 				orderBy = "found_Time";
 			}
 			ResultSet rs = HiveSqlService.getResultSet(page, mmAvUrlLog,
 					Configurations.getStringProperty(MmAvUrlLog.class.getSimpleName() + "HiveTable", "MM_AV_URL_LOG"),
 					getCol2Col(), orderBy, null);
-			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmAvIpLog.class, "foundTime",
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmAvUrlLog.class, "foundTime",
 					"recvTime");
 			if (tableMapping == null) {
 				logPage.setList(new ArrayList());
@@ -1127,31 +1134,31 @@ public class LogController extends BaseRestController {
 				logPage, 0);
 	}
 	
-	@RequestMapping(value = "/mmVoipLogs", method = RequestMethod.GET)
+	@RequestMapping(value = "/mmVoipIpLogs", method = RequestMethod.GET)
-	@ApiOperation(value = "VOIP日志查询", httpMethod = "GET", notes = "对日志功能“VOIP日志”提供数据基础查询服务")
+	@ApiOperation(value = "VOIP IP日志查询", httpMethod = "GET", notes = "对日志功能“VOIP IP日志”提供数据基础查询服务")
-	public Map<String, ?> mmVoipLogs(Page page, MmVoipLog mmVoipLog, Model model, HttpServletRequest request,
+	public Map<String, ?> mmVoipIpLogs(Page page, MmVoipIpLog mmVoipIpLog, Model model, HttpServletRequest request,
 			HttpServletResponse response) {
 		long start = System.currentTimeMillis();
 		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
 				request, null);
 
-		Page<MmVoipLog> logPage = null;
+		Page<MmVoipIpLog> logPage = null;
 		try {
-			resetTime(mmVoipLog);
+			resetTime(mmVoipIpLog);
-			ntcReportService.queryConditionCheck(auditLogThread, start, mmVoipLog, MmAvIpLog.class, page);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmVoipIpLog, MmVoipIpLog.class, page);
-			logPage = new Page<MmVoipLog>();
+			logPage = new Page<MmVoipIpLog>();
 			logPage.setPageNo(page.getPageNo());
 			logPage.setPageSize(page.getPageSize());
 			String orderBy = "";
 			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
-				orderBy = Page.getOrderBySql(MmVoipLog.class.getSimpleName(), page.getOrderBy());
+				orderBy = Page.getOrderBySql(MmVoipIpLog.class.getSimpleName(), page.getOrderBy());
 			} else {
 				orderBy = "found_Time";
 			}
-			ResultSet rs = HiveSqlService.getResultSet(page, mmVoipLog,
+			ResultSet rs = HiveSqlService.getResultSet(page, mmVoipIpLog,
-					Configurations.getStringProperty(MmVoipLog.class.getSimpleName() + "HiveTable", "MM_VOIP_LOG"),
+					Configurations.getStringProperty(MmVoipIpLog.class.getSimpleName() + "HiveTable", "MM_VOIP_IP_LOG"),
 					getCol2Col(), orderBy, null);
-			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmVoipLog.class, "foundTime",
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmVoipIpLog.class, "foundTime",
 					"recvTime");
 			if (tableMapping == null) {
 				logPage.setList(new ArrayList());
@@ -1159,8 +1166,61 @@ public class LogController extends BaseRestController {
 				List list = tableMapping.get("obj");
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
-					List<MmVoipLog> List = (java.util.List<MmVoipLog>) JsonMapper.fromJsonList(jsonString,
+					List<MmVoipIpLog> List = (java.util.List<MmVoipIpLog>) JsonMapper.fromJsonList(jsonString,
-							MmVoipLog.class);
+							MmVoipIpLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "VOIP IP日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VOIP IP日志检索成功",
+				logPage, 0);
+	}
+	@RequestMapping(value = "/mmVoipAccountLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "VOIP Account日志查询", httpMethod = "GET", notes = "对日志功能“VOIP Account日志”提供数据基础查询服务")
+	public Map<String, ?> mmVoipAccountLogs(Page page, MmVoipAccountLog mmVoipLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmVoipAccountLog> logPage = null;
+		try {
+			resetTime(mmVoipLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmVoipLog, MmVoipAccountLog.class, page);
+			logPage = new Page<MmVoipAccountLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmVoipAccountLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmVoipLog,
+					Configurations.getStringProperty(MmVoipAccountLog.class.getSimpleName() + "HiveTable", "MM_VOIP_ACCOUNT_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmVoipAccountLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmVoipAccountLog> List = (java.util.List<MmVoipAccountLog>) JsonMapper.fromJsonList(jsonString,
+							MmVoipAccountLog.class);
 					logPage.setList(List);
 					logPage.setCount(List.size());
 
@@ -1180,6 +1240,327 @@ public class LogController extends BaseRestController {
 		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VOIP日志检索成功",
 				logPage, 0);
 	}
+	
+	@RequestMapping(value = "/mmSampleAudioLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "音频样例日志查询", httpMethod = "GET", notes = "对日志功能“音频样例日志”提供数据基础查询服务")
+	public Map<String, ?> mmSampleAudioLogs(Page page, MmSampleAudioLog mmSampleAudioLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmSampleAudioLog> logPage = null;
+		try {
+			resetTime(mmSampleAudioLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmSampleAudioLog, MmSampleAudioLog.class, page);
+			logPage = new Page<MmSampleAudioLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmSampleAudioLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmSampleAudioLog,
+					Configurations.getStringProperty(MmSampleAudioLog.class.getSimpleName() + "HiveTable", "MM_SAMPLE_AUDIO_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmSampleAudioLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmSampleAudioLog> List = (java.util.List<MmSampleAudioLog>) JsonMapper.fromJsonList(jsonString,
+							MmSampleAudioLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "音频样例日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "音频样例日志检索成功",
+				logPage, 0);
+	}
+	@RequestMapping(value = "/mmSampleVideoLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "视频样例日志查询", httpMethod = "GET", notes = "对日志功能“视频样例日志”提供数据基础查询服务")
+	public Map<String, ?> mmSampleVideoLogs(Page page, MmSampleVideoLog mmSampleVideoLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmSampleVideoLog> logPage = null;
+		try {
+			resetTime(mmSampleVideoLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmSampleVideoLog, MmSampleVideoLog.class, page);
+			logPage = new Page<MmSampleVideoLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmSampleVideoLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmSampleVideoLog,
+					Configurations.getStringProperty(MmSampleVideoLog.class.getSimpleName() + "HiveTable", "MM_SAMPLE_VIDEO_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmSampleVideoLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmSampleVideoLog> List = (java.util.List<MmSampleVideoLog>) JsonMapper.fromJsonList(jsonString,
+							MmSampleVideoLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "视频样例日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "视频样例日志检索成功",
+				logPage, 0);
+	}
+	@RequestMapping(value = "/mmPornAudioLevelLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "音频色情日志查询", httpMethod = "GET", notes = "对日志功能“音频色情日志”提供数据基础查询服务")
+	public Map<String, ?> mmPornAudioLevelLogs(Page page, MmPornAudioLevelLog mmPornAudioLevelLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmPornAudioLevelLog> logPage = null;
+		try {
+			resetTime(mmPornAudioLevelLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmPornAudioLevelLog, MmPornAudioLevelLog.class, page);
+			logPage = new Page<MmPornAudioLevelLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmPornAudioLevelLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmPornAudioLevelLog,
+					Configurations.getStringProperty(MmPornAudioLevelLog.class.getSimpleName() + "HiveTable", "MM_PORN_AUDIO_LEVEL_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmPornAudioLevelLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmPornAudioLevelLog> List = (java.util.List<MmPornAudioLevelLog>) JsonMapper.fromJsonList(jsonString,
+							MmPornAudioLevelLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "音频色情日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "音频色情日志检索成功",
+				logPage, 0);
+	}
+	@RequestMapping(value = "/mmPornVideoLevelLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "视频色情日志查询", httpMethod = "GET", notes = "对日志功能“视频色情日志”提供数据基础查询服务")
+	public Map<String, ?> mmPornVideoLevelLogs(Page page, MmPornVideoLevelLog mmPornVideoLevelLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmPornVideoLevelLog> logPage = null;
+		try {
+			resetTime(mmPornVideoLevelLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmPornVideoLevelLog, MmPornVideoLevelLog.class, page);
+			logPage = new Page<MmPornVideoLevelLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmPornVideoLevelLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmPornVideoLevelLog,
+					Configurations.getStringProperty(MmPornVideoLevelLog.class.getSimpleName() + "HiveTable", "MM_PRON_VIDEO_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmPornVideoLevelLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmPornVideoLevelLog> List = (java.util.List<MmPornVideoLevelLog>) JsonMapper.fromJsonList(jsonString,
+							MmPornVideoLevelLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "视频色情日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "视频色情日志检索成功",
+				logPage, 0);
+	}
+	
+	@RequestMapping(value = "/mmSamplePicLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "图片样例日志查询", httpMethod = "GET", notes = "对日志功能“图片样例日志”提供数据基础查询服务")
+	public Map<String, ?> mmSamplePicLogs(Page page, MmSamplePicLog mmSamplePicLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmSamplePicLog> logPage = null;
+		try {
+			resetTime(mmSamplePicLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmSamplePicLog, MmSamplePicLog.class, page);
+			logPage = new Page<MmSamplePicLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmSamplePicLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmSamplePicLog,
+					Configurations.getStringProperty(MmSamplePicLog.class.getSimpleName() + "HiveTable", "MM_SAMPLE_PIC_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmSamplePicLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmSamplePicLog> List = (java.util.List<MmSamplePicLog>) JsonMapper.fromJsonList(jsonString,
+							MmSamplePicLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "图片样例日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "图片样例日志检索成功",
+				logPage, 0);
+	}
+	@RequestMapping(value = "/mmSampleVoipLogs", method = RequestMethod.GET)
+	@ApiOperation(value = "VOIP样例日志查询", httpMethod = "GET", notes = "对日志功能“VOIP样例日志”提供数据基础查询服务")
+	public Map<String, ?> mmSampleVoipLogs(Page page, MmSampleVoipLog mmSampleVoipLog, Model model, HttpServletRequest request,
+			HttpServletResponse response) {
+		long start = System.currentTimeMillis();
+		AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
+				request, null);
+
+		Page<MmSampleVoipLog> logPage = null;
+		try {
+			resetTime(mmSampleVoipLog);
+			ntcReportService.queryConditionCheck(auditLogThread, start, mmSampleVoipLog, MmSampleVoipLog.class, page);
+			logPage = new Page<MmSampleVoipLog>();
+			logPage.setPageNo(page.getPageNo());
+			logPage.setPageSize(page.getPageSize());
+			String orderBy = "";
+			if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
+				orderBy = Page.getOrderBySql(MmSampleVoipLog.class.getSimpleName(), page.getOrderBy());
+			} else {
+				orderBy = "found_Time";
+			}
+			ResultSet rs = HiveSqlService.getResultSet(page, mmSampleVoipLog,
+					Configurations.getStringProperty(MmSampleVoipLog.class.getSimpleName() + "HiveTable", "MM_SAMPLE_VOIP_LOG"),
+					getCol2Col(), orderBy, null);
+			Map<String, List> tableMapping = HiveJDBC.tableMapping(page, null, rs, MmSampleVoipLog.class, "foundTime",
+					"recvTime");
+			if (tableMapping == null) {
+				logPage.setList(new ArrayList());
+			} else {
+				List list = tableMapping.get("obj");
+				if (list.size() > 0) {
+					String jsonString = JsonMapper.toJsonString(list);
+					List<MmSampleVoipLog> List = (java.util.List<MmSampleVoipLog>) JsonMapper.fromJsonList(jsonString,
+							MmSampleVoipLog.class);
+					logPage.setList(List);
+					logPage.setCount(List.size());
+
+				} else {
+					logPage.setList(new ArrayList());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
+			logger.error(e);
+			if (!(e instanceof RestServiceException)) {
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "VOIP样例日志检索失败");
+			}
+			throw ((RestServiceException) e);
+		}
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VOIP样例日志检索成功",
+				logPage, 0);
+	}
+	
 	@RequestMapping(value = "/pxyHttpLogs", method = RequestMethod.GET)
 	@ApiOperation(value = "PXY HTTP日志查询", httpMethod = "GET", notes = "对日志功能“控制策略”-“HTTP日志”提供数据基础查询服务")
 	public Map<String, ?> pxyHttpLogs(Page page, PxyHttpLog pxyHttpLog, Model model, HttpServletRequest request,

src/main/java/com/nis/web/dao/DfLogSearchDao.xml

@@ -491,7 +491,213 @@
 		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
 	</resultMap>
 	
-	<resultMap id="MmVoipLogMap" type="com.nis.domain.restful.MmVoipLog">
+	<resultMap id="MmVoipIpLogMap" type="com.nis.domain.restful.MmVoipIpLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="duation" jdbcType="VARCHAR" property="duation" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+		<result column="calling_account" jdbcType="VARCHAR" property="callingAccount" />
+		<result column="called_account" jdbcType="VARCHAR" property="calledAccount" />
+		<result column="calling_number" jdbcType="VARCHAR" property="callingNumber" />
+		<result column="called_number" jdbcType="VARCHAR" property="calledNumber" />
+		<result column="from_to_store_ip" jdbcType="VARCHAR" property="fromToStoreIp" />
+		<result column="from_to_store_url" jdbcType="VARCHAR" property="fromToStoreUrl" />
+		<result column="to_from_store_ip" jdbcType="VARCHAR" property="toFromStoreIp" />
+		<result column="to_from_store_url" jdbcType="VARCHAR" property="toFromStoreUrl" />
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+	</resultMap>
+	<resultMap id="MmVoipAccountLogMap" type="com.nis.domain.restful.MmVoipAccountLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="duation" jdbcType="VARCHAR" property="duation" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+		<result column="calling_account" jdbcType="VARCHAR" property="callingAccount" />
+		<result column="called_account" jdbcType="VARCHAR" property="calledAccount" />
+		<result column="calling_number" jdbcType="VARCHAR" property="callingNumber" />
+		<result column="called_number" jdbcType="VARCHAR" property="calledNumber" />
+		<result column="from_to_store_ip" jdbcType="VARCHAR" property="fromToStoreIp" />
+		<result column="from_to_store_url" jdbcType="VARCHAR" property="fromToStoreUrl" />
+		<result column="to_from_store_ip" jdbcType="VARCHAR" property="toFromStoreIp" />
+		<result column="to_from_store_url" jdbcType="VARCHAR" property="toFromStoreUrl" />
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+	</resultMap>
+	
+	<resultMap id="MmSampleAudioLogMap" type="com.nis.domain.restful.MmSampleAudioLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="url" jdbcType="VARCHAR" property="url" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="refer" jdbcType="VARCHAR" property="refer" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+	</resultMap>
+	
+	<resultMap id="MmSampleVideoLogMap" type="com.nis.domain.restful.MmSampleVideoLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="url" jdbcType="VARCHAR" property="url" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="refer" jdbcType="VARCHAR" property="refer" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+	</resultMap>
+	<resultMap id="MmPornAudioLevelLogMap" type="com.nis.domain.restful.MmPornAudioLevelLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="url" jdbcType="VARCHAR" property="url" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="refer" jdbcType="VARCHAR" property="refer" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+	</resultMap>
+	<resultMap id="MmPornVideoLevelLogMap" type="com.nis.domain.restful.MmPornVideoLevelLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="url" jdbcType="VARCHAR" property="url" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="refer" jdbcType="VARCHAR" property="refer" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+	</resultMap>
+	<resultMap id="MmSamplePicLogMap" type="com.nis.domain.restful.MmSamplePicLog">
+		<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="trans_proto" jdbcType="VARCHAR" property="transProto" />
+		<result column="addr_type" jdbcType="INTEGER" property="addrType" />
+		<result column="d_ip" jdbcType="VARCHAR" property="dIp" />
+		<result column="s_ip" jdbcType="VARCHAR" property="sIp" />
+		<result column="d_port" jdbcType="VARCHAR" property="dPort" />
+		<result column="s_port" jdbcType="VARCHAR" property="sPort" />
+		<result column="service" jdbcType="INTEGER" property="service" />
+		<result column="entrance_id" jdbcType="BIGINT" property="entranceId" />
+		<result column="device_id" jdbcType="INTEGER" property="deviceId" />
+		<result column="direction" jdbcType="INTEGER" property="direction" />
+		<result column="stream_dir" jdbcType="INTEGER" property="streamDir" />
+		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
+		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
+		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		
+		<result column="pid" jdbcType="VARCHAR" property="pid" />
+		<result column="url" jdbcType="VARCHAR" property="url" />
+		<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
+		<result column="refer" jdbcType="VARCHAR" property="refer" />
+		<result column="level" jdbcType="INTEGER" property="level" />
+		<result column="fd_type" jdbcType="INTEGER" property="fdType" />
+		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+	</resultMap>
+	
+	<resultMap id="MmSampleVoipLogMap" type="com.nis.domain.restful.MmSampleVoipLog">
 		<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
 		<result column="found_Time" jdbcType="TIMESTAMP" property="foundTime" />
 		<result column="recv_Time" jdbcType="TIMESTAMP" property="recvTime" />

src/main/resources/applicationLog-hive.properties

@@ -17,7 +17,14 @@ MmAvIpLogHiveTable=MM_AV_IP_LOG
 MmAvUrlLogHiveTable=MM_AV_URL_LOG
 MmPicIpLogHiveTable=MM_PIC_IP_LOG
 MmPicUrlLogHiveTable=MM_PIC_URL_LOG
-MmVoipIpLogHiveTable=MM_VOIP_LOG
+MmVoipIpLogHiveTable=MM_VOIP_IP_LOG
+MmVoipAccountLogHiveTable=MM_VOIP_ACCOUNT_LOG
+MmSampleAudioLogHiveTable=MM_SAMPLE_AUDIO_LOG
+MmSampleVideoLogLogHiveTable=MM_SAMPLE_VIDEO_LOG
+MmPornAudioLevelLogHiveTable=MM_PORN_AUDIO_LEVEL_LOG
+MmPornVideoLevelLogHiveTable=MM_PORN_VIDEO_LEVEL_LOG
+MmSamplePicLogHiveTable=MM_SAMPLE_PIC_LOG
+MmSampleVoipLogHiveTable=MM_SAMPLE_VOIP_LOG
 PxyHttpLogHiveTable=PXY_HTTP_LOG