diff --git a/src/main/java/com/nis/domain/restful/MmVoipLog.java b/src/main/java/com/nis/domain/restful/MmVoipLog.java index b116e54..46c62c4 100644 --- a/src/main/java/com/nis/domain/restful/MmVoipLog.java +++ b/src/main/java/com/nis/domain/restful/MmVoipLog.java @@ -37,11 +37,11 @@ public class MmVoipLog extends LogEntity { protected String toFromStoreUrl; @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 Integer level; + @ApiModelProperty(value="封堵类型", required=true) protected Integer fdType; public String getPid() { @@ -50,12 +50,6 @@ public class MmVoipLog extends LogEntity { 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; } @@ -128,4 +122,11 @@ public class MmVoipLog extends LogEntity { public void setToFromStoreUrl(String toFromStoreUrl) { this.toFromStoreUrl = toFromStoreUrl; } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index 514ed6d..0bbd857 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -511,20 +511,18 @@ + - - - - - + + - + diff --git a/src/main/java/com/nis/web/service/restful/NtcReportService.java b/src/main/java/com/nis/web/service/restful/NtcReportService.java index 447d377..dd60189 100644 --- a/src/main/java/com/nis/web/service/restful/NtcReportService.java +++ b/src/main/java/com/nis/web/service/restful/NtcReportService.java @@ -34,6 +34,7 @@ public class NtcReportService extends BaseLogService { public Page findNtcPzReport(Page page, NtcPzReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcPzReport(entity)); if ("1".equals(entity.getSearchBusinessType())) { Page pageTotal = new Page(); @@ -59,36 +60,43 @@ public class NtcReportService extends BaseLogService { public Page findNtcServiceReport(Page page, NtcServiceReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcServiceReport(entity)); return page; } public Page findNtcTagReport(Page page, NtcTagReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcTagReport(entity)); return page; } public Page findNtcAttrTypeReport(Page page, NtcAttrTypeReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcAttrTypeReport(entity)); return page; } public Page findNtcLwhhReport(Page page, NtcLwhhReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcLwhhReport(entity)); return page; } public Page findNtcSrcipDomesticReport(Page page, NtcSrcipDomesticReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcSrcipDomesticReport(entity)); return page; } public Page findNtcDestipCountryReport(Page page, NtcDestipCountryReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcDestipCountryReport(entity)); return page; } public Page findNtcEntranceReport(Page page, NtcEntranceReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcEntranceReport(entity)); return page; }