From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 150 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 112 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
old mode 100644
new mode 100755
index 9d4a9dc..347d0e6
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -24,23 +24,30 @@
import com.genersoft.iot.vmp.utils.JsonUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import java.io.File;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
/**
* 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞�
@@ -87,7 +94,7 @@
@Autowired
- private ZLMServerFactory ZLMServerFactory;
+ private ZLMServerFactory zlmServerFactory;
@Autowired
private EventPublisher publisher;
@@ -104,6 +111,11 @@
@Autowired
private RedisTemplate<Object, Object> redisTemplate;
+ @Qualifier("taskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
+
+
/**
* 鍒濆鍖�
@@ -116,36 +128,8 @@
continue;
}
// 鏇存柊
- if (ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
+ if (!ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
- }
- if (userSetting.getGbSendStreamStrict()) {
- int startPort = 50000;
- int endPort = 60000;
- String sendRtpPortRange = mediaServerItem.getSendRtpPortRange();
- if (sendRtpPortRange == null) {
- logger.warn("[zlm] ] 鏈厤缃彂娴佺鍙ｈ寖鍥达紝榛樿浣跨敤50000鍒�60000");
- }else {
- String[] sendRtpPortRangeArray = sendRtpPortRange.trim().split(",");
- if (sendRtpPortRangeArray.length != 2) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
- }else {
- try {
- startPort = Integer.parseInt(sendRtpPortRangeArray[0]);
- endPort = Integer.parseInt(sendRtpPortRangeArray[1]);
- if (endPort <= startPort) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岀粨鏉熺鍙ｅ簲澶т簬寮�濮嬬鍙�,浣跨敤榛樿绔彛");
- startPort = 50000;
- endPort = 60000;
- }
-
- }catch (NumberFormatException e) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
- }
- }
- }
- logger.info("[[zlm] ] 閰嶇疆鍙戞祦绔彛鑼冨洿锛寋}-{}", startPort, endPort);
- sendRtpPortManager.initServerPort(mediaServerItem.getId(), startPort, endPort);
}
// 鏌ヨredis鏄惁瀛樺湪姝ediaServer
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
@@ -177,11 +161,16 @@
}
if (streamId == null) {
- streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ streamId = String.format("%08x", Long.parseLong(ssrc)).toUpperCase();
+ }
+ int ssrcCheckParam = 0;
+ if (ssrcCheck && tcpMode > 1) {
+ // 鐩墠zlm涓嶆敮鎸� tcp妯″紡鏇存柊ssrc锛屾殏鏃跺叧闂璼src鏍￠獙
+ logger.warn("[openRTPServer] TCP琚姩/TCP涓诲姩鏀舵祦鏃讹紝榛樿鍏抽棴ssrc妫�楠�");
}
int rtpServerPort;
if (mediaServerItem.isRtpEnable()) {
- rtpServerPort = ZLMServerFactory.createRTPServer(mediaServerItem, streamId, ssrcCheck?Integer.parseInt(ssrc):0, port, reUsePort, tcpMode);
+ rtpServerPort = zlmServerFactory.createRTPServer(mediaServerItem, streamId, (ssrcCheck && tcpMode == 0) ? Long.parseLong(ssrc) : 0, port, reUsePort, tcpMode);
} else {
rtpServerPort = mediaServerItem.getRtpProxyPort();
}
@@ -193,7 +182,7 @@
if (mediaServerItem == null) {
return;
}
- ZLMServerFactory.closeRtpServer(mediaServerItem, streamId);
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId);
}
@Override
@@ -202,7 +191,7 @@
callback.run(false);
return;
}
- ZLMServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
}
@Override
@@ -213,7 +202,7 @@
@Override
public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
- return ZLMServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ return zlmServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
}
@Override
@@ -240,7 +229,7 @@
mediaServerMapper.update(mediaSerItem);
MediaServerItem mediaServerItemInRedis = getOne(mediaSerItem.getId());
MediaServerItem mediaServerItemInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
- if (mediaServerItemInRedis == null || ssrcFactory.hasMediaServerSSRC(mediaSerItem.getId())) {
+ if (mediaServerItemInRedis == null || !ssrcFactory.hasMediaServerSSRC(mediaSerItem.getId())) {
ssrcFactory.initMediaServerSSRC(mediaServerItemInDataBase.getId(),null);
}
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItemInDataBase.getId();
@@ -422,7 +411,7 @@
}
mediaServerMapper.update(serverItem);
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId();
- if (ssrcFactory.hasMediaServerSSRC(serverItem.getId())) {
+ if (!ssrcFactory.hasMediaServerSSRC(serverItem.getId())) {
ssrcFactory.initMediaServerSSRC(zlmServerConfig.getGeneralMediaServerId(), null);
}
redisTemplate.opsForValue().set(key, serverItem);
@@ -580,7 +569,7 @@
Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
if (mediaServerItem.getRtspPort() != 0) {
- param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -t 0.001 %s");
+ param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
}
param.put("hook.enable","1");
param.put("hook.on_flow_report","");
@@ -772,4 +761,89 @@
return result;
}
+ @Override
+ public List<RecordFile> getRecords(String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
+ Assert.notNull(app, "app涓嶅瓨鍦�");
+ Assert.notNull(stream, "stream涓嶅瓨鍦�");
+ Assert.notNull(startTime, "startTime涓嶅瓨鍦�");
+ Assert.notNull(endTime, "endTime涓嶅瓨鍦�");
+ Assert.notEmpty(mediaServerItems, "娴佸獟浣撳垪琛ㄤ负绌�");
+
+ CompletableFuture[] completableFutures = new CompletableFuture[mediaServerItems.size()];
+ for (int i = 0; i < mediaServerItems.size(); i++) {
+ completableFutures[i] = getRecordFilesForOne(app, stream, startTime, endTime, mediaServerItems.get(i));
+ }
+ List<RecordFile> result = new ArrayList<>();
+ for (int i = 0; i < completableFutures.length; i++) {
+ try {
+ List<RecordFile> list = (List<RecordFile>) completableFutures[i].get();
+ if (!list.isEmpty()) {
+ for (int g = 0; g < list.size(); g++) {
+ list.get(g).setMediaServerId(mediaServerItems.get(i).getId());
+ }
+ result.addAll(list);
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ Comparator<RecordFile> comparator = Comparator.comparing(RecordFile::getFileName);
+ result.sort(comparator);
+ return result;
+ }
+
+ @Override
+ public List<String> getRecordDates(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems) {
+ Assert.notNull(app, "app涓嶅瓨鍦�");
+ Assert.notNull(stream, "stream涓嶅瓨鍦�");
+ Assert.notEmpty(mediaServerItems, "娴佸獟浣撳垪琛ㄤ负绌�");
+ CompletableFuture[] completableFutures = new CompletableFuture[mediaServerItems.size()];
+
+ for (int i = 0; i < mediaServerItems.size(); i++) {
+ completableFutures[i] = getRecordDatesForOne(app, stream, year, month, mediaServerItems.get(i));
+ }
+ List<String> result = new ArrayList<>();
+ CompletableFuture.allOf(completableFutures).join();
+ for (CompletableFuture completableFuture : completableFutures) {
+ try {
+ List<String> list = (List<String>) completableFuture.get();
+ result.addAll(list);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ Collections.sort(result);
+ return result;
+ }
+
+ @Async
+ public CompletableFuture<List<String>> getRecordDatesForOne(String app, String stream, int year, int month, MediaServerItem mediaServerItem) {
+ JSONObject fileListJson = assistRESTfulUtils.getDateList(mediaServerItem, app, stream, year, month);
+ if (fileListJson != null && !fileListJson.isEmpty()) {
+ if (fileListJson.getString("code") != null && fileListJson.getInteger("code") == 0) {
+ JSONArray data = fileListJson.getJSONArray("data");
+ return CompletableFuture.completedFuture(data.toJavaList(String.class));
+ }
+ }
+ return CompletableFuture.completedFuture(new ArrayList<>());
+ }
+
+ @Async
+ public CompletableFuture<List<RecordFile>> getRecordFilesForOne(String app, String stream, String startTime, String endTime, MediaServerItem mediaServerItem) {
+ JSONObject fileListJson = assistRESTfulUtils.getFileList(mediaServerItem, 1, 100000000, app, stream, startTime, endTime);
+ if (fileListJson != null && !fileListJson.isEmpty()) {
+ if (fileListJson.getString("code") != null && fileListJson.getInteger("code") == 0) {
+ JSONObject data = fileListJson.getJSONObject("data");
+ JSONArray list = data.getJSONArray("list");
+ if (list != null) {
+ return CompletableFuture.completedFuture(list.toJavaList(RecordFile.class));
+ }
+ }
+ }
+ return CompletableFuture.completedFuture(new ArrayList<>());
+ }
}
--
Gitblit v1.8.0