From c25a99d60bef3d3bbd59fee895bd658928fd00db Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 10 一月 2024 16:17:29 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 8 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..d9d6fe3 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,15 @@
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.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;
@@ -13,14 +17,13 @@
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
@@ -32,10 +35,19 @@
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) {
+ public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
// 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
Long startTimeStamp = null;
Long endTimeStamp = null;
@@ -54,7 +66,8 @@
}
PageHelper.startPage(page, count);
- List<CloudRecordItem> all = cloudRecordServiceMapper.getList(app, stream, startTimeStamp, endTimeStamp, mediaServerItems);
+ List<CloudRecordItem> all = cloudRecordServiceMapper.getList(query, app, stream, startTimeStamp, endTimeStamp,
+ null, mediaServerItems);
return new PageInfo<>(all);
}
@@ -69,7 +82,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(null, app, stream, startTimeStamp,
+ endTimeStamp, null, mediaServerItems);
if (cloudRecordItemList.isEmpty()) {
return new ArrayList<>();
}
@@ -83,12 +97,133 @@
@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();
+ }
+ }
+ 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<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 app, String stream, String callId, 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, app, stream, callId, taskId, isEnd);
+ if (result.getInteger("code") != 0) {
+ throw new ControllerException(result.getInteger("code"), 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;
+ 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;
+ 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);
+ }
}
--
Gitblit v1.8.0