Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

支持abl录像下载

dev/abl支持
648540858 2024-05-29 10:52:28 +08:00
parent 98c62b93f7
commit 3e9def7aac
3 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
View File

@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.media.abl;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
@ -11,10 +13,14 @@ import com.genersoft.iot.vmp.media.abl.bean.AblServerConfig;
import com.genersoft.iot.vmp.media.abl.bean.hook.OnStreamArriveABLHookParam;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.event.media.MediaDepartureEvent;
import com.genersoft.iot.vmp.media.event.media.MediaRecordProcessEvent;
import com.genersoft.iot.vmp.media.service.IMediaNodeServerService;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -45,6 +51,9 @@ public class ABLMediaNodeServerService implements IMediaNodeServerService {
@Autowired
private CloudRecordServiceMapper cloudRecordServiceMapper;
@Autowired
private IInviteStreamService inviteStreamService;
@Override
public boolean initStopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc) {
return false;
@ -288,11 +297,41 @@ public class ABLMediaNodeServerService implements IMediaNodeServerService {
CloudRecordItem cloudRecordItem = cloudRecordServiceMapper.getListByFileName(event.getApp(), event.getStream(), event.getFileName());
if (cloudRecordItem == null) {
cloudRecordItem = CloudRecordItem.getInstance(event);
cloudRecordItem.setStartTime(System.currentTimeMillis() - event.getCurrentFileDuration() * 1000);
cloudRecordItem.setEndTime(System.currentTimeMillis());
cloudRecordServiceMapper.add(cloudRecordItem);
}else {
cloudRecordServiceMapper.updateTimeLen(cloudRecordItem.getId(), (long)event.getCurrentFileDuration() * 1000);
cloudRecordServiceMapper.updateTimeLen(cloudRecordItem.getId(), (long)event.getCurrentFileDuration() * 1000, System.currentTimeMillis());
}
}
// 收流结束
@EventListener
public void onApplicationEvent(MediaDepartureEvent event) {
InviteInfo inviteInfo = inviteStreamService.getInviteInfo(InviteSessionType.DOWNLOAD, null, null, event.getStream());
if (inviteInfo == null || inviteInfo.getStreamInfo() == null) {
return;
}
List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(null, event.getApp(), event.getStream(), null, null, null, null, null);
if (cloudRecordItemList.isEmpty()) {
return;
}
long startTime = cloudRecordItemList.get(cloudRecordItemList.size() - 1).getStartTime();
long endTime = cloudRecordItemList.get(0).getEndTime();
JSONObject jsonObject = ablresTfulUtils.queryRecordList(event.getMediaServer(), event.getApp(), event.getStream(), DateUtil.timestampMsToUrlToyyyy_MM_dd_HH_mm_ss(startTime),
DateUtil.timestampMsToUrlToyyyy_MM_dd_HH_mm_ss(endTime));
if (jsonObject == null || jsonObject.getInteger("code") != 0) {
return;
}
JSONObject urlJson = jsonObject.getJSONObject("url");
if (urlJson == null) {
return;
}
String download = urlJson.getString("download");
DownloadFileInfo downloadFileInfo = new DownloadFileInfo();
downloadFileInfo.setHttpPath(download);
downloadFileInfo.setHttpsPath(download);
inviteInfo.getStreamInfo().setDownLoadFilePath(downloadFileInfo);
}
@Override
public Long updateDownloadProcess(MediaServer mediaServer, String app, String stream) {

13
src/main/java/com/genersoft/iot/vmp/media/abl/ABLRESTfulUtils.java
View File

@ -27,9 +27,6 @@ public class ABLRESTfulUtils {
private OkHttpClient client;
public interface RequestCallback{
void run(JSONObject response);
}
@ -375,6 +372,16 @@ public class ABLRESTfulUtils {
param.put("stream", stream);
return sendPost(mediaServer,"getMediaList", param, null);
}
public JSONObject queryRecordList(MediaServer mediaServer, String app, String stream, String startTime, String endTime) {
Map<String, Object> param = new HashMap<>();
param.put("app", app);
param.put("stream", stream);
param.put("starttime", startTime);
param.put("endtime", endTime);
return sendPost(mediaServer,"queryRecordList", param, null);
}
public void getSnap(MediaServer mediaServer, String app, String stream, int timeoutSec, String path, String fileName) {
Map<String, Object> param = new HashMap<>();
param.put("app", app);

4
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
View File

@ -131,7 +131,7 @@ public interface CloudRecordServiceMapper {
CloudRecordItem getListByFileName(@Param("app") String app, @Param("stream") String stream, @Param("fileName") String fileName);
@Update(" <script>" +
"update wvp_cloud_record set time_len = #{currentFileDuration} where id = #{id} " +
"update wvp_cloud_record set time_len = #{time}, end_time = #{endTime} where id = #{id} " +
" </script>")
void updateTimeLen(int id, Long currentFileDuration);
void updateTimeLen(@Param("id") int id, @Param("time") Long time, @Param("endTime") long endTime);
}