gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
doufenghu
2018-07-19 10:20:38 +08:00
parent 6ee382738a b1a43100b0
commit 3c0cd4651f
5 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/nis/domain/restful/MmVoipLog.java
View File

@@ -37,11 +37,11 @@ public class MmVoipLog extends LogEntity<MmVoipLog> {
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<MmVoipLog> {
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<MmVoipLog> {
public void setToFromStoreUrl(String toFromStoreUrl) {
this.toFromStoreUrl = toFromStoreUrl;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
}

10
src/main/java/com/nis/web/dao/DfLogSearchDao.xml
View File

@@ -511,20 +511,18 @@
<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_store_from_ip" jdbcType="VARCHAR" property="toFromStoreIp" />
<result column="to_store_from_url" jdbcType="VARCHAR" property="toFromStoreUrl" />
<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
<result column="refer" jdbcType="VARCHAR" property="refer" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
<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="url" jdbcType="VARCHAR" property="url" />
<result column="log_uri" jdbcType="VARCHAR" property="logUri" />
<result column="level" jdbcType="INTEGER" property="level" />
<result column="fd_type" jdbcType="INTEGER" property="fdType" />
</resultMap>

8
src/main/java/com/nis/web/service/restful/NtcReportService.java
View File

@@ -34,6 +34,7 @@ public class NtcReportService extends BaseLogService {
public Page<?> findNtcPzReport(Page<NtcPzReport> page, NtcPzReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcPzReport(entity));
if ("1".equals(entity.getSearchBusinessType())) {
Page<Map> pageTotal = new Page<Map>();
@@ -59,36 +60,43 @@ public class NtcReportService extends BaseLogService {
public Page<NtcServiceReport> findNtcServiceReport(Page<NtcServiceReport> page, NtcServiceReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcServiceReport(entity));
return page;
}
public Page<NtcTagReport> findNtcTagReport(Page<NtcTagReport> page, NtcTagReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcTagReport(entity));
return page;
}
public Page<NtcAttrTypeReport> findNtcAttrTypeReport(Page<NtcAttrTypeReport> page, NtcAttrTypeReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcAttrTypeReport(entity));
return page;
}
public Page<NtcLwhhReport> findNtcLwhhReport(Page<NtcLwhhReport> page, NtcLwhhReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcLwhhReport(entity));
return page;
}
public Page<NtcSrcipDomesticReport> findNtcSrcipDomesticReport(Page<NtcSrcipDomesticReport> page, NtcSrcipDomesticReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcSrcipDomesticReport(entity));
return page;
}
public Page<NtcDestipCountryReport> findNtcDestipCountryReport(Page<NtcDestipCountryReport> page, NtcDestipCountryReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcDestipCountryReport(entity));
return page;
}
public Page<NtcEntranceReport> findNtcEntranceReport(Page<NtcEntranceReport> page, NtcEntranceReport entity)
throws Exception {
entity.setPage(page);
page.setList(dao.findNtcEntranceReport(entity));
return page;
}