From c107112fcbe4262077d9f1fb6382e635d9c89dcc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 七月 2025 09:26:27 +0800
Subject: [PATCH] 视频监控URL增加一个路径参数&date=以备实现手动刷新

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

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..2bbd078 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,12 @@
     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;//
+
+    private static final String DATEPATHPARAM = "&date=";
 
     @Autowired
     private void setSv(VideoSv sv, YsAppSv ysSv){
@@ -96,14 +100,29 @@
                         sb.append("&url=");
                         sb.append(requestVideoCameraPreUrl);
                         sb.append(vo.devNo);
-                        sb.append(requestVideoCameraTailUrl);
-                        vvo.videoUrl4Simple = sb.toString() + "simple";
-                        vvo.videoUrl4Standard = sb.toString() + "standard" ;
-                        vvo.videoUrl4Security = sb.toString() + "security" ;
+                        sb.append(requestVideoCameraTail4LiveUrl);
+                        sb.append("&");
+                        sb.append(requestVideoCameraTail4ThemeIdUrl);
+                        vvo.videoUrl4Simple = sb.toString() + "simple" + DATEPATHPARAM ;
+                        vvo.videoUrl4Standard = sb.toString() + "standard" + DATEPATHPARAM ;
+                        vvo.videoUrl4Security = sb.toString() + "security" + DATEPATHPARAM ;
+
+                        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);
+                        sb1.append("&");
+                        sb1.append(requestVideoCameraTail4ThemeIdUrl);
+                        vvo.videoUrl4PcLive = sb1.toString() + "pcLive&env=" + DATEPATHPARAM ;
                     }else{
                         vvo.videoUrl4Simple = "" ;
                         vvo.videoUrl4Standard = "" ;
                         vvo.videoUrl4Security = "" ;
+                        vvo.videoUrl4PcLive = "" ;
                     }
                     list.add(vvo) ;
                 }

--
Gitblit v1.8.0