From 5a75381a00a555443925bbbd8e333b14473b3ed1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 17 十月 2023 15:34:01 +0800
Subject: [PATCH] 基于新的云端录像结构实现国标录像
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
index d9f5189..1d8a537 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
@@ -1,11 +1,17 @@
package com.genersoft.iot.vmp.service.impl;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam;
import com.genersoft.iot.vmp.service.ICloudRecordService;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
@@ -32,7 +38,16 @@
private CloudRecordServiceMapper cloudRecordServiceMapper;
@Autowired
+ private IMediaServerService mediaServerService;
+
+ @Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private AssistRESTfulUtils assistRESTfulUtils;
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
@Override
public PageInfo<CloudRecordItem> getList(int page, int count, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
@@ -54,7 +69,8 @@
}
PageHelper.startPage(page, count);
- List<CloudRecordItem> all = cloudRecordServiceMapper.getList(app, stream, startTimeStamp, endTimeStamp, mediaServerItems);
+ List<CloudRecordItem> all = cloudRecordServiceMapper.getList(app, stream, startTimeStamp, endTimeStamp,
+ null, mediaServerItems);
return new PageInfo<>(all);
}
@@ -69,7 +85,8 @@
}
long startTimeStamp = startDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond();
long endTimeStamp = endDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond();
- List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(app, stream, startTimeStamp, endTimeStamp, mediaServerItems);
+ List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(app, stream, startTimeStamp,
+ endTimeStamp, null, mediaServerItems);
if (cloudRecordItemList.isEmpty()) {
return new ArrayList<>();
}
@@ -83,12 +100,71 @@
@Override
public void addRecord(OnRecordMp4HookParam param) {
- CloudRecordItem cloudRecordItem = CloudRecordItem.getInstance(param);
+ CloudRecordItem cloudRecordItem = CloudRecordItem.getInstance(param);
StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
if (streamAuthorityInfo != null) {
cloudRecordItem.setCallId(streamAuthorityInfo.getCallId());
}
- logger.info("[娣诲姞褰曞儚璁板綍] {}/{} 鏂囦欢澶у皬锛歿}", param.getApp(), param.getStream(), param.getFile_size());
+ logger.info("[娣诲姞褰曞儚璁板綍] {}/{} 鏂囦欢澶у皬锛歿}, 鏃堕暱锛� {}绉�", param.getApp(), param.getStream(), param.getFile_size(),param.getTime_len());
cloudRecordServiceMapper.add(cloudRecordItem);
}
+
+ @Override
+ public String addTask(String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String remoteHost) {
+ // 鍙傛暟鏍￠獙
+ assert app != null;
+ assert stream != null;
+ MediaServerItem mediaServerItem = null;
+ if (mediaServerId == null) {
+ mediaServerItem = mediaServerService.getDefaultMediaServer();
+ }else {
+ mediaServerItem = mediaServerService.getOne(mediaServerId);
+ }
+ if (mediaServerItem == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
+ }else {
+ if (remoteHost == null) {
+ remoteHost = "http://" + mediaServerItem.getStreamIp() + ":" + mediaServerItem.getRecordAssistPort();
+ }
+ }
+ Long startTimeStamp = null;
+ Long endTimeStamp = null;
+ if (startTime != null) {
+ startTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
+ }
+ if (endTime != null) {
+ endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
+ }
+
+ List<MediaServerItem> mediaServers = new ArrayList<>();
+ mediaServers.add(mediaServerItem);
+ // 妫�绱㈢浉鍏崇殑褰曞儚鏂囦欢
+ List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathList(app, stream, startTimeStamp, endTimeStamp, callId, mediaServers);
+ if (filePathList == null || filePathList.isEmpty()) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈绱㈠埌瑙嗛鏂囦欢");
+ }
+ JSONObject result = assistRESTfulUtils.addTask(mediaServerItem, app, stream, startTime, endTime, callId, filePathList, remoteHost);
+ if (result.getInteger("code") != 0) {
+ throw new ControllerException(result.getInteger("code"), result.getString("msg"));
+ }
+ return result.getString("data");
+ }
+
+ @Override
+ public JSONArray queryTask(String taskId, String mediaServerId, Boolean isEnd) {
+ MediaServerItem mediaServerItem = null;
+ if (mediaServerId == null) {
+ mediaServerItem = mediaServerService.getDefaultMediaServer();
+ }else {
+ mediaServerItem = mediaServerService.getOne(mediaServerId);
+ }
+ if (mediaServerItem == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
+ }
+ JSONObject result = assistRESTfulUtils.queryTaskList(mediaServerItem, taskId, isEnd);
+ if (result.getInteger("code") != 0) {
+ throw new ControllerException(result.getInteger("code"), result.getString("msg"));
+ }
+ return result.getJSONArray("data");
+ }
}
--
Gitblit v1.8.0