From f14966e7c0338b4c749fee51c73470ca0230f163 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 07 Apr 2021 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java
index 8d7ee85..6ac2dc9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java
@@ -202,13 +202,14 @@
* Javacv录制视频
*/
@PostMapping("/rVoids")
- public void rVoids() {
+ public void rVoids(String url) {
String UUID = DateUtil.time();
UUIDs=UUID;
RecordVideoThread recordVideoThread = new RecordVideoThread();
recordVideoThread.filePath = "D:\\software\\minio\\data\\jfpt\\void\\"+UUID + ".mp4";
recordVideoThread.timesSec = 0L;
- recordVideoThread.streamURL = "https://web.byisf.com:18000/live?port=1935&app=live&stream=0012415A75C6-1";// 最好设置结束时长 如直接停止程序会造成输出文件的损坏无法正常播放
+ String newJson = StringEscapeUtils.unescapeHtml4(url);
+ recordVideoThread.streamURL =newJson;// 最好设置结束时长 如直接停止程序会造成输出文件的损坏无法正常播放
recordVideoThread.isAudio = true;
thread = new Thread(recordVideoThread);
thread.start();
@@ -217,7 +218,7 @@
@PostMapping("/stop")
- public void stop(String jid) throws FrameGrabber.Exception {
+ public String stop(String jid) throws FrameGrabber.Exception {
//返回前端路径
String vaddress = null;
thread.stop();
@@ -225,6 +226,8 @@
vaddress = "https://web.byisf.com/" + PRF_MINIO_URL + UUIDs + ".mp4";
//把路径通过警情id添加到警情信息
alarmService.updateVaddress(vaddress,jid);
+ return vaddress;
+
}
}
--
Gitblit v1.9.3