From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 296 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 197 insertions(+), 99 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 5af3d64..a7b582d 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
@@ -2,35 +2,43 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
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.bean.MediaServer;
+import com.genersoft.iot.vmp.media.event.media.MediaRecordMp4Event;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
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.service.bean.DownloadFileInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
+import com.genersoft.iot.vmp.utils.CloudRecordUtils;
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.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import org.springframework.util.unit.DataUnit;
-import java.time.*;
-import java.time.temporal.TemporalAccessor;
-import java.util.*;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
@Service
+@DS("share")
public class CloudRecordServiceImpl implements ICloudRecordService {
+
private final static Logger logger = LoggerFactory.getLogger(CloudRecordServiceImpl.class);
@@ -50,7 +58,123 @@
private VideoStreamSessionManager streamSession;
@Override
- public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
+ public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServer> mediaServerItems, String callId) {
+ // 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
+ 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_ssToTimestampMs(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_ssToTimestampMs(endTime);
+
+ }
+ PageHelper.startPage(page, count);
+ List<CloudRecordItem> all = cloudRecordServiceMapper.getList(query, app, stream, startTimeStamp, endTimeStamp,
+ callId, mediaServerItems, null);
+ return new PageInfo<>(all);
+ }
+
+ @Override
+ public List<String> getDateList(String app, String stream, int year, int month, List<MediaServer> mediaServerItems) {
+ LocalDate startDate = LocalDate.of(year, month, 1);
+ LocalDate endDate;
+ if (month == 12) {
+ endDate = LocalDate.of(year + 1, 1, 1);
+ }else {
+ endDate = LocalDate.of(year, month + 1, 1);
+ }
+ long startTimeStamp = startDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond() * 1000;
+ long endTimeStamp = endDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond() * 1000;
+ List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(null, app, stream, startTimeStamp,
+ endTimeStamp, null, mediaServerItems, null);
+ if (cloudRecordItemList.isEmpty()) {
+ return new ArrayList<>();
+ }
+ Set<String> resultSet = new HashSet<>();
+ cloudRecordItemList.stream().forEach(cloudRecordItem -> {
+ String date = DateUtil.timestampTo_yyyy_MM_dd(cloudRecordItem.getStartTime());
+ resultSet.add(date);
+ });
+ return new ArrayList<>(resultSet);
+ }
+
+ @Async("taskExecutor")
+ @EventListener
+ public void onApplicationEvent(MediaRecordMp4Event event) {
+ CloudRecordItem cloudRecordItem = CloudRecordItem.getInstance(event);
+ if (ObjectUtils.isEmpty(cloudRecordItem.getCallId())) {
+ StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(event.getApp(), event.getStream());
+ if (streamAuthorityInfo != null) {
+ cloudRecordItem.setCallId(streamAuthorityInfo.getCallId());
+ }
+ }
+ logger.info("[娣诲姞褰曞儚璁板綍] {}/{}, callId: {}, 鍐呭锛歿}", event.getApp(), event.getStream(), cloudRecordItem.getCallId(), event.getRecordInfo());
+ cloudRecordServiceMapper.add(cloudRecordItem);
+ }
+
+ @Override
+ public String addTask(String app, String stream, MediaServer mediaServerItem, String startTime, String endTime,
+ String callId, String remoteHost, boolean filterMediaServer) {
+ // 鍙傛暟鏍￠獙
+ assert app != null;
+ assert stream != null;
+ if (mediaServerItem.getRecordAssistPort() == 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "涓洪厤缃瓵ssist鏈嶅姟");
+ }
+ 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<MediaServer> mediaServers = new ArrayList<>();
+ mediaServers.add(mediaServerItem);
+ // 妫�绱㈢浉鍏崇殑褰曞儚鏂囦欢
+ List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathList(app, stream, startTimeStamp,
+ endTimeStamp, callId, filterMediaServer ? mediaServers : null);
+ 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 app, String stream, String callId, String taskId, String mediaServerId,
+ Boolean isEnd, String scheme) {
+ MediaServer 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, app, stream, callId, taskId, isEnd, scheme);
+ if (result == null || result.getInteger("code") != 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), result == null ? "鏌ヨ浠诲姟鍒楄〃澶辫触" : result.getString("msg"));
+ }
+ return result.getJSONArray("data");
+ }
+
+ @Override
+ public int changeCollect(boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId) {
// 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
Long startTimeStamp = null;
Long endTimeStamp = null;
@@ -68,103 +192,77 @@
endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
}
- PageHelper.startPage(page, count);
- List<CloudRecordItem> all = cloudRecordServiceMapper.getList(query, app, stream, startTimeStamp, endTimeStamp,
- null, mediaServerItems);
- return new PageInfo<>(all);
- }
- @Override
- public List<String> getDateList(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems) {
- LocalDate startDate = LocalDate.of(year, month, 1);
- LocalDate endDate;
- if (month == 12) {
- endDate = LocalDate.of(year + 1, 1, 1);
- }else {
- endDate = LocalDate.of(year, month + 1, 1);
- }
- long startTimeStamp = startDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond();
- long endTimeStamp = endDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond();
- List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(null, app, stream, startTimeStamp,
- endTimeStamp, null, mediaServerItems);
- if (cloudRecordItemList.isEmpty()) {
- return new ArrayList<>();
- }
- Set<String> resultSet = new HashSet<>();
- cloudRecordItemList.stream().forEach(cloudRecordItem -> {
- String date = DateUtil.timestampTo_yyyy_MM_dd(cloudRecordItem.getStartTime());
- resultSet.add(date);
- });
- return new ArrayList<>(resultSet);
- }
-
- @Override
- public void addRecord(OnRecordMp4HookParam 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(),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();
+ List<MediaServer> mediaServerItems;
+ if (!ObjectUtils.isEmpty(mediaServerId)) {
+ mediaServerItems = new ArrayList<>();
+ MediaServer 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, null);
+ if (all.isEmpty()) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板緟鏀惰棌鐨勮棰�");
+ }
+ int limitCount = 50;
+ int resultCount = 0;
+ 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();
+ }
+ resultCount += cloudRecordServiceMapper.updateCollectList(result, all.subList(i, toIndex));
+
+ }
+ }else {
+ resultCount = cloudRecordServiceMapper.updateCollectList(result, all);
+ }
+ return resultCount;
+ }
+
+ @Override
+ public int changeCollectById(Integer recordId, boolean result) {
+ return cloudRecordServiceMapper.changeCollectById(result, recordId);
+ }
+
+ @Override
+ public DownloadFileInfo getPlayUrlPath(Integer recordId) {
+ CloudRecordItem recordItem = cloudRecordServiceMapper.queryOne(recordId);
+ if (recordItem == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "璧勬簮涓嶅瓨鍦�");
+ }
+ String filePath = recordItem.getFilePath();
+ MediaServer mediaServerItem = mediaServerService.getOne(recordItem.getMediaServerId());
+ return CloudRecordUtils.getDownloadFilePath(mediaServerItem, filePath);
+ }
+
+ @Override
+ public List<CloudRecordItem> getAllList(String query, String app, String stream, String startTime, String endTime, List<MediaServer> mediaServerItems, String callId, List<Integer> ids) {
+ // 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
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);
- }
+ if (startTime != null ) {
+ if (!DateUtil.verification(startTime, DateUtil.formatter)) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "寮�濮嬫椂闂存牸寮忛敊璇紝姝ｇ‘鏍煎紡涓猴細 " + DateUtil.formatter);
+ }
+ startTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestampMs(startTime);
- 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");
- }
+ if (endTime != null ) {
+ if (!DateUtil.verification(endTime, DateUtil.formatter)) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "缁撴潫鏃堕棿鏍煎紡閿欒锛屾纭牸寮忎负锛� " + DateUtil.formatter);
+ }
+ endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestampMs(endTime);
- @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");
+ return cloudRecordServiceMapper.getList(query, app, stream, startTimeStamp, endTimeStamp,
+ callId, mediaServerItems, ids);
}
}
--
Gitblit v1.8.0