From 962f42e4bd9098e210138504759ba2bc7f69c702 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 19 Apr 2021 11:04:15 +0800
Subject: [PATCH] 1.音视频录制

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java |   10 +++++++---
 1 files changed, 7 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..b2f3108 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
@@ -135,6 +135,7 @@
 	/**
 	 * 删除
 	 */
+
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
@@ -202,13 +203,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 +219,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 +227,8 @@
 		vaddress = "https://web.byisf.com/" + PRF_MINIO_URL + UUIDs + ".mp4";
 		//把路径通过警情id添加到警情信息
 		alarmService.updateVaddress(vaddress,jid);
+		return vaddress;
+
 	}
 
 }

--
Gitblit v1.9.3