From 5cd5c0c790377873ec88e2ec9160c6246590d91c Mon Sep 17 00:00:00 2001 From: renkaige Date: Mon, 15 Oct 2018 15:59:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ediaLog.java => NtcStreamingMediaLog.java} | 2 +- .../restful/NtcLogSearchController.java | 20 +++++++++---------- .../applicationLog-clickhouse.properties | 2 +- .../resources/applicationLog-hive.properties | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/com/nis/domain/restful/{NtcStreamMediaLog.java => NtcStreamingMediaLog.java} (91%) diff --git a/src/main/java/com/nis/domain/restful/NtcStreamMediaLog.java b/src/main/java/com/nis/domain/restful/NtcStreamingMediaLog.java similarity index 91% rename from src/main/java/com/nis/domain/restful/NtcStreamMediaLog.java rename to src/main/java/com/nis/domain/restful/NtcStreamingMediaLog.java index d18f8fe..cb2bbb1 100644 --- a/src/main/java/com/nis/domain/restful/NtcStreamMediaLog.java +++ b/src/main/java/com/nis/domain/restful/NtcStreamingMediaLog.java @@ -10,7 +10,7 @@ import com.wordnik.swagger.annotations.ApiModelProperty; * @date 2018年10月9日 下午6:33:11 * @version V1.0 */ -public class NtcStreamMediaLog extends LogEntity { +public class NtcStreamingMediaLog extends LogEntity { private static final long serialVersionUID = 8993339583170276251L; @ApiModelProperty(value="节目访问地址", required=true) protected String url; diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java index 2112d00..77679bf 100644 --- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java @@ -31,7 +31,7 @@ import com.nis.domain.restful.NtcP2pLog; import com.nis.domain.restful.NtcPptpLog; import com.nis.domain.restful.NtcSshLog; 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.restful.RestServiceException; import com.nis.util.Configurations; @@ -1027,29 +1027,29 @@ public class NtcLogSearchController extends BaseRestController { @RequestMapping(value = "/ntcStreamMediaLogs", method = RequestMethod.GET) @ApiOperation(value = "流媒体协议日志查询", httpMethod = "GET", notes = "对日志功能“流媒体协议日志”提供数据基础查询服务") - public Map ntcStreamMediaLogs(Page page, NtcStreamMediaLog ntcStreamMediaLog, Model model, HttpServletRequest request, + public Map ntcStreamMediaLogs(Page page, NtcStreamingMediaLog ntcStreamMediaLog, Model model, HttpServletRequest request, HttpServletResponse response) { long start = System.currentTimeMillis(); AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); - Page logPage = null; + Page logPage = null; try { resetTime(ntcStreamMediaLog); - ntcLogService.queryConditionCheck(auditLogThread, start, ntcStreamMediaLog, NtcStreamMediaLog.class, page); - logPage = new Page(); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcStreamMediaLog, NtcStreamingMediaLog.class, page); + logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); String orderBy = ""; if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcStreamMediaLog.class.getSimpleName(), page.getOrderBy()); + orderBy = Page.getOrderBySql(NtcStreamingMediaLog.class.getSimpleName(), page.getOrderBy()); } else { orderBy = "found_Time"; } 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); - Map> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamMediaLog.class, "foundTime", + Map> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamingMediaLog.class, "foundTime", "recvTime"); if (tableMapping == null) { logPage.setList(new ArrayList()); @@ -1057,8 +1057,8 @@ public class NtcLogSearchController extends BaseRestController { List list = tableMapping.get("obj"); if (list.size() > 0) { String jsonString = JsonMapper.toJsonString(list); - List List = (java.util.List) JsonMapper.fromJsonList(jsonString, - NtcStreamMediaLog.class); + List List = (java.util.List) JsonMapper.fromJsonList(jsonString, + NtcStreamingMediaLog.class); logPage.setList(List); logPage.setCount(List.size()); diff --git a/src/main/resources/applicationLog-clickhouse.properties b/src/main/resources/applicationLog-clickhouse.properties index a10364e..6ecf6a0 100644 --- a/src/main/resources/applicationLog-clickhouse.properties +++ b/src/main/resources/applicationLog-clickhouse.properties @@ -32,7 +32,7 @@ MmFaceRecognizationLogClickHouseTable=TBS_ODS_MM_FACE_RECOGNIZATION_LOG MmLogoDetectionLogClickHouseTable=TBS_ODS_MM_LOGO_DETECTION_LOG MmSpeakerRecognizationLogClickHouseTable=TBS_ODS_MM_SPEAKER_RECOGNIZATION_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 diff --git a/src/main/resources/applicationLog-hive.properties b/src/main/resources/applicationLog-hive.properties index de67e5f..7a903d2 100644 --- a/src/main/resources/applicationLog-hive.properties +++ b/src/main/resources/applicationLog-hive.properties @@ -32,7 +32,7 @@ MmFaceRecognizationLogHiveTable=MM_FACE_RECOGNIZATION_LOG MmLogoDetectionLogHiveTable=MM_LOGO_DETECTION_LOG MmSpeakerRecognizationLogHiveTable=MM_SPEAKER_RECOGNIZATION_LOG NtcVoipLogHiveTable=NTC_VOIP_LOG -NtcStreamMediaLogHiveTable=NTC_STREAM_MEDIA_LOG +NtcStreamingMediaLogHiveTable=NTC_STREAMING_MEDIA_LOG MmFileDigestLogHiveTable=MM_FILE_DIGEST_LOG