XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化云端录像定时清理

Browse Source
This commit is contained in:
648540858
2023-10-19 17:52:19 +08:00
parent 9b036fb71d
commit daac0010b1
13 changed files with 340 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
View File

@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
@@ -40,4 +39,15 @@ public interface ICloudRecordService {
* 查询合并任务列表
*/
JSONArray queryTask(String taskId, String mediaServerId, Boolean isEnd);
/**
* 收藏视频，收藏的视频过期不会删除
*/
void changeCollect(String type, boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String collectType);
/**
* 添加指定录像收藏
*/
void changeCollectById(Integer recordId, String collectType, boolean result);
}

2
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
View File

@@ -93,4 +93,6 @@ public interface IMediaServerService {
*/
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
List<MediaServerItem> getAllWithAssistPort();
}

25
src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
View File

@@ -57,9 +57,14 @@ public class CloudRecordItem {
private String folder;
/**
* 收藏类型，收藏的文件不移除
* 收藏，收藏的文件不移除
*/
private String collectType;
private Boolean collect;
/**
* 保留，收藏的文件不移除
*/
private Boolean reserve;
/**
* 文件大小
@@ -182,11 +187,19 @@ public class CloudRecordItem {
this.timeLen = timeLen;
}
public String getCollectType() {
return collectType;
public Boolean getCollect() {
return collect;
}
public void setCollectType(String collectType) {
this.collectType = collectType;
public void setCollect(Boolean collect) {
this.collect = collect;
}
public Boolean getReserve() {
return reserve;
}
public void setReserve(Boolean reserve) {
this.reserve = reserve;
}
}

74
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
View File

@@ -3,8 +3,6 @@ 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;
@@ -19,14 +17,13 @@ import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.unit.DataUnit;
import java.time.*;
import java.time.temporal.TemporalAccessor;
import java.util.*;
@Service
@@ -167,4 +164,73 @@ public class CloudRecordServiceImpl implements ICloudRecordService {
}
return result.getJSONArray("data");
}
@Override
public void changeCollect(String type, boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String collectType) {
// 开始时间和结束时间在数据库中都是以秒为单位的
Long startTimeStamp = null;
Long endTimeStamp = null;
if (startTime != null ) {
if (!DateUtil.verification(startTime, DateUtil.formatter)) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "开始时间格式错误，正确格式为： " + DateUtil.formatter);
}
startTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
}
if (endTime != null ) {
if (!DateUtil.verification(endTime, DateUtil.formatter)) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "结束时间格式错误，正确格式为： " + DateUtil.formatter);
}
endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
}
List<MediaServerItem> mediaServerItems;
if (!ObjectUtils.isEmpty(mediaServerId)) {
mediaServerItems = new ArrayList<>();
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId);
}
mediaServerItems.add(mediaServerItem);
} else {
mediaServerItems = null;
}
List<CloudRecordItem> all = cloudRecordServiceMapper.getList(null, app, stream, startTimeStamp, endTimeStamp,
callId, mediaServerItems);
if (all.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到待收藏的视频");
}
int limitCount = 50;
if (all.size() > limitCount) {
for (int i = 0; i < all.size(); i += limitCount) {
int toIndex = i + limitCount;
if (i + limitCount > all.size()) {
toIndex = all.size();
}
if ("collect".equals(collectType)) {
cloudRecordServiceMapper.updateCollectList(result, all.subList(i, toIndex));
}else if ("reserve".equals(collectType)) {
cloudRecordServiceMapper.updateReserveList(result, all.subList(i, toIndex));
}
}
}else {
if ("collect".equals(collectType)) {
cloudRecordServiceMapper.updateCollectList(result, all);
}else if ("reserve".equals(collectType)) {
cloudRecordServiceMapper.updateReserveList(result, all);
}
}
}
@Override
public void changeCollectById(Integer recordId, String collectType, boolean result) {
if ("collect".equals(collectType)) {
cloudRecordServiceMapper.changeCollectById(result, recordId);
}else if ("reserve".equals(collectType)) {
cloudRecordServiceMapper.changeReserveById(result, recordId);
}
}
}

5
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
View File

@@ -752,4 +752,9 @@ public class MediaServerServiceImpl implements IMediaServerService {
result.setGbSend(redisCatchStorage.getGbSendCount(mediaServerItem.getId()));
return result;
}
@Override
public List<MediaServerItem> getAllWithAssistPort() {
return mediaServerMapper.queryAllWithAssistPort();
}
}