From e1534c601e1310575264a0ddc5266bdd2c47750b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 09 七月 2025 09:48:34 +0800
Subject: [PATCH] 萤石云视频监控，增加livePc模式
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java | 23 ++++++++++++++++++++---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VoVideo.java | 1 +
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 3 ++-
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 5109cd1..f1ca69d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -495,7 +495,8 @@
requestAccessTokenUrl: https://open.ys7.com/api/lapp/token/get
requestVideoCommonUrl: https://open.ys7.com/console/jssdk/pc.html
requestVideoCameraPreUrl: ezopen://open.ys7.com/
- requestVideoCameraTailUrl: /1.live&themeId=
+ requestVideoCameraTail4LiveUrl: /1.live
+ requestVideoCameraTail4ThemeIdUrl: themeId=
types:
- 1,钀ょ煶 #1:钀ょ煶
#- 2,娴峰悍 #2:娴峰悍
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java
index 627f0b0..0566a76 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java
@@ -48,8 +48,10 @@
private String requestVideoCommonUrl;//
@Value("${video.ys.requestVideoCameraPreUrl: ezopen://open.ys7.com/}")
private String requestVideoCameraPreUrl;//
- @Value("${video.ys.requestVideoCameraTailUrl: /1.live&themeId=}")
- private String requestVideoCameraTailUrl;//
+ @Value("${video.ys.requestVideoCameraTail4LiveUrl: /1.live}")
+ private String requestVideoCameraTail4LiveUrl;//
+ @Value("${video.ys.requestVideoCameraTail4ThemeIdUrl: themeId=}")
+ private String requestVideoCameraTail4ThemeIdUrl;//
@Autowired
private void setSv(VideoSv sv, YsAppSv ysSv){
@@ -96,14 +98,29 @@
sb.append("&url=");
sb.append(requestVideoCameraPreUrl);
sb.append(vo.devNo);
- sb.append(requestVideoCameraTailUrl);
+ sb.append(requestVideoCameraTail4LiveUrl);
+ sb.append("&");
+ sb.append(requestVideoCameraTail4ThemeIdUrl);
vvo.videoUrl4Simple = sb.toString() + "simple";
vvo.videoUrl4Standard = sb.toString() + "standard" ;
vvo.videoUrl4Security = sb.toString() + "security" ;
+
+ StringBuilder sb1 = new StringBuilder();
+ sb1.append(requestVideoCommonUrl);
+ sb1.append("&url=");
+ sb1.append(requestVideoCameraPreUrl);
+ sb1.append(vo.devNo);
+ sb1.append(requestVideoCameraTail4LiveUrl);
+ sb1.append("&accessToken=");
+ sb1.append(ysApp.accessToken);
+ sb.append("&");
+ sb1.append(requestVideoCameraTail4ThemeIdUrl);
+ vvo.videoUrl4PcLive = sb1.toString() + "pcLive&env=" ;
}else{
vvo.videoUrl4Simple = "" ;
vvo.videoUrl4Standard = "" ;
vvo.videoUrl4Security = "" ;
+ vvo.videoUrl4PcLive = "" ;
}
list.add(vvo) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VoVideo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VoVideo.java
index 714fc10..74b59c5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VoVideo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VoVideo.java
@@ -17,4 +17,5 @@
public String videoUrl4Simple ;
public String videoUrl4Standard ;
public String videoUrl4Security ;
+ public String videoUrl4PcLive ;
}
--
Gitblit v1.8.0