From 2044db864bea04b93e59f2417b7a635a82581ecb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 13 十二月 2022 11:25:03 +0800
Subject: [PATCH] 视频流地址修改

---
 ycl-platform/src/main/java/com/ycl/util/VideoUtil.java                        |   16 ++++++++++------
 ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java |    6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
index e2e04f2..8c870e9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
@@ -41,9 +41,9 @@
                                          @RequestParam(required = false) Integer communityId) {
 
         IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, current.intValue(), size.intValue());
-        pointVoIPage.getRecords()
-                .stream()
-                .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0)));
+//        pointVoIPage.getRecords()
+//                .stream()
+//                .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0)));
         return CommonResult.success(pointVoIPage);
     }
 
diff --git a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
index 5617455..8dd2fbd 100644
--- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
@@ -22,16 +22,16 @@
 public class VideoUtil {
 
     @Value("${videoPoint.url}")
-    private  String url;
+    private String url;
 
     @Value("${videoPoint.userName}")
-    private  String userName;
+    private String userName;
 
     @Value("${videoPoint.passWord}")
-    private  String passWord;
+    private String passWord;
 
     @Value("${videoPoint.ip}")
-    private  String ip;
+    private String ip;
 
     /*
      * @Description  subType:绫诲瀷int锛岄�夊～銆傜爜娴佺被鍨嬶紝0:涓荤爜娴併��1:杈呮祦1銆�2:杈呮祦2銆傞粯璁や负0涓荤爜娴併�俿cheme:绫诲瀷string锛岄�夊～銆傚崗璁被鍨嬶紝鏀寔RTSP銆丗LV_HTTP銆丠LS涓夌锛岄粯璁TSP銆�
@@ -39,12 +39,16 @@
      * @return java.lang.String
      **/
     @SneakyThrows
-    public  String getVideo(String code, String scheme,Integer subType) {
+    public String getVideo(String code, String scheme, Integer subType) {
         String clientType = "winpc";
         String reqUrl = "/videoService/accounts/authorize";
         String deviceUrl = "/videoService/devicesManager/devices";
-        String monitorUrl = "/videoService/realmonitor/uri?subType=" + subType + "&scheme=" + scheme + "&channelId=";
+//        String monitorUrl = "/videoService/realmonitor/uri?subType=" + subType + "&scheme=" + scheme + "&channelId=";
 
+        String monitorUrl = "/videoService/realmonitor/uri?trackId=&encryptedInfo=&userId=&urlType=1&keyIndex=&regionId=&packtype=Private&planId=&subType=" + subType + "&isroute=false&streamType=&locationEnable=false&domainId=&duration=600&scheme=RTSP&dataType=2&extend=&channelId=";
+        if (!"RTSP".equals(scheme)) {
+            monitorUrl = "/videoService/realmonitor/uri?subType=" + subType + "&scheme=" + scheme + "&channelId=";
+        }
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.setErrorHandler(new DefaultResponseErrorHandler() {
             @Override

--
Gitblit v1.8.0