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

修改流媒体相关的属性

Browse Source
This commit is contained in:
renkaige
2018-10-15 15:59:44 +08:00
parent e71ab5c82a
commit 5cd5c0c790
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/restful/NtcStreamMediaLog.java → src/main/java/com/nis/domain/restful/NtcStreamingMediaLog.java
View File

@@ -10,7 +10,7 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
* @date 2018年10月9日 下午6:33:11 * @date 2018年10月9日 下午6:33:11
* @version V1.0 * @version V1.0
*/ */
public class NtcStreamMediaLog extends LogEntity<NtcStreamMediaLog> { public class NtcStreamingMediaLog extends LogEntity<NtcStreamingMediaLog> {
private static final long serialVersionUID = 8993339583170276251L; private static final long serialVersionUID = 8993339583170276251L;
@ApiModelProperty(value="节目访问地址", required=true) @ApiModelProperty(value="节目访问地址", required=true)
protected String url; protected String url;

20
src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java
View File

@@ -31,7 +31,7 @@ import com.nis.domain.restful.NtcP2pLog;
import com.nis.domain.restful.NtcPptpLog; import com.nis.domain.restful.NtcPptpLog;
import com.nis.domain.restful.NtcSshLog; import com.nis.domain.restful.NtcSshLog;
import com.nis.domain.restful.NtcSslLog; import com.nis.domain.restful.NtcSslLog;
import com.nis.domain.restful.NtcStreamMediaLog; import com.nis.domain.restful.NtcStreamingMediaLog;
import com.nis.domain.restful.NtcVoipLog; import com.nis.domain.restful.NtcVoipLog;
import com.nis.restful.RestServiceException; import com.nis.restful.RestServiceException;
import com.nis.util.Configurations; import com.nis.util.Configurations;
@@ -1027,29 +1027,29 @@ public class NtcLogSearchController extends BaseRestController {
@RequestMapping(value = "/ntcStreamMediaLogs", method = RequestMethod.GET) @RequestMapping(value = "/ntcStreamMediaLogs", method = RequestMethod.GET)
@ApiOperation(value = "流媒体协议日志查询", httpMethod = "GET", notes = "对日志功能“流媒体协议日志”提供数据基础查询服务") @ApiOperation(value = "流媒体协议日志查询", httpMethod = "GET", notes = "对日志功能“流媒体协议日志”提供数据基础查询服务")
public Map<String, ?> ntcStreamMediaLogs(Page page, NtcStreamMediaLog ntcStreamMediaLog, Model model, HttpServletRequest request, public Map<String, ?> ntcStreamMediaLogs(Page page, NtcStreamingMediaLog ntcStreamMediaLog, Model model, HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET,
request, null); request, null);
Page<NtcStreamMediaLog> logPage = null; Page<NtcStreamingMediaLog> logPage = null;
try { try {
resetTime(ntcStreamMediaLog); resetTime(ntcStreamMediaLog);
ntcLogService.queryConditionCheck(auditLogThread, start, ntcStreamMediaLog, NtcStreamMediaLog.class, page); ntcLogService.queryConditionCheck(auditLogThread, start, ntcStreamMediaLog, NtcStreamingMediaLog.class, page);
logPage = new Page<NtcStreamMediaLog>(); logPage = new Page<NtcStreamingMediaLog>();
logPage.setPageNo(page.getPageNo()); logPage.setPageNo(page.getPageNo());
logPage.setPageSize(page.getPageSize()); logPage.setPageSize(page.getPageSize());
String orderBy = ""; String orderBy = "";
if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { if (null != page.getOrderBy() && !page.getOrderBy().equals("")) {
orderBy = Page.getOrderBySql(NtcStreamMediaLog.class.getSimpleName(), page.getOrderBy()); orderBy = Page.getOrderBySql(NtcStreamingMediaLog.class.getSimpleName(), page.getOrderBy());
} else { } else {
orderBy = "found_Time"; orderBy = "found_Time";
} }
String sql = HiveSqlService.getSql(page, ntcStreamMediaLog, String sql = HiveSqlService.getSql(page, ntcStreamMediaLog,
getTableName(NtcStreamMediaLog.class.getSimpleName() + "HiveTable", "NTC_STREAM_MEDIA_LOG"), getTableName(NtcStreamingMediaLog.class.getSimpleName() + "HiveTable", "NTC_STREAM_MEDIA_LOG"),
getCol2Col(), orderBy, null); getCol2Col(), orderBy, null);
Map<String, List<Object>> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamMediaLog.class, "foundTime", Map<String, List<Object>> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamingMediaLog.class, "foundTime",
"recvTime"); "recvTime");
if (tableMapping == null) { if (tableMapping == null) {
logPage.setList(new ArrayList()); logPage.setList(new ArrayList());
@@ -1057,8 +1057,8 @@ public class NtcLogSearchController extends BaseRestController {
List list = tableMapping.get("obj"); List list = tableMapping.get("obj");
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcStreamMediaLog> List = (java.util.List<NtcStreamMediaLog>) JsonMapper.fromJsonList(jsonString, List<NtcStreamingMediaLog> List = (java.util.List<NtcStreamingMediaLog>) JsonMapper.fromJsonList(jsonString,
NtcStreamMediaLog.class); NtcStreamingMediaLog.class);
logPage.setList(List); logPage.setList(List);
logPage.setCount(List.size()); logPage.setCount(List.size());

2
src/main/resources/applicationLog-clickhouse.properties
View File

@@ -32,7 +32,7 @@ MmFaceRecognizationLogClickHouseTable=TBS_ODS_MM_FACE_RECOGNIZATION_LOG
MmLogoDetectionLogClickHouseTable=TBS_ODS_MM_LOGO_DETECTION_LOG MmLogoDetectionLogClickHouseTable=TBS_ODS_MM_LOGO_DETECTION_LOG
MmSpeakerRecognizationLogClickHouseTable=TBS_ODS_MM_SPEAKER_RECOGNIZATION_LOG MmSpeakerRecognizationLogClickHouseTable=TBS_ODS_MM_SPEAKER_RECOGNIZATION_LOG
NtcVoipLogClickHouseTable=TBS_ODS_NTC_VOIP_LOG NtcVoipLogClickHouseTable=TBS_ODS_NTC_VOIP_LOG
NtcStreamMediaLogClickHouseTable=TBS_ODS_NTC_STREAM_MEDIA_LOG NtcStreamingMediaLogClickHouseTable=TBS_ODS_NTC_STREAMING_MEDIA_LOG
MmFileDigestLogClickHouseTable=TBS_ODS_MM_FILE_DIGEST_LOG MmFileDigestLogClickHouseTable=TBS_ODS_MM_FILE_DIGEST_LOG

2
src/main/resources/applicationLog-hive.properties
View File

@@ -32,7 +32,7 @@ MmFaceRecognizationLogHiveTable=MM_FACE_RECOGNIZATION_LOG
MmLogoDetectionLogHiveTable=MM_LOGO_DETECTION_LOG MmLogoDetectionLogHiveTable=MM_LOGO_DETECTION_LOG
MmSpeakerRecognizationLogHiveTable=MM_SPEAKER_RECOGNIZATION_LOG MmSpeakerRecognizationLogHiveTable=MM_SPEAKER_RECOGNIZATION_LOG
NtcVoipLogHiveTable=NTC_VOIP_LOG NtcVoipLogHiveTable=NTC_VOIP_LOG
NtcStreamMediaLogHiveTable=NTC_STREAM_MEDIA_LOG NtcStreamingMediaLogHiveTable=NTC_STREAMING_MEDIA_LOG
MmFileDigestLogHiveTable=MM_FILE_DIGEST_LOG MmFileDigestLogHiveTable=MM_FILE_DIGEST_LOG