修改超时时间

liujun001
1 parent a968f4e5
Showing 4 changed files with 10 additions and 26 deletions
src/main/java/com/bsth/controller/video/VideoController.java
src/main/java/com/bsth/service/impl/videoimpl/WvpConfig.java
src/main/resources/application-test.properties
src/main/resources/static/pages/video/video.js
@@ -108,6 +108,7 @@ public class VideoController {
             result.put("data", videoChannels);
             result.put("channelImageURL", wvpConfig.getChannelListOfImgURL());
             result.put("wvpPlayURL", wvpConfig.getWvpPlayURL());
+            result.put("wvpLiveBroadcast", wvpConfig.getWvpLiveBroadcast());
         } catch (Exception e) {
             log.error("查询车辆通道异常:[{}]", carNo, e);
@@ -28,4 +28,6 @@ public class WvpConfig {
     @Value("${wvp.channel.history.list.url}")
     private String wvpChannelHistoryUrl;
+    @Value("${wvp.channel.live.broadcast.url}")
+    private String wvpLiveBroadcast;
 }
@@ -78,8 +78,10 @@ wvp.login.url=http://61.169.120.202:28080/api/user/login
 wvp.channel.list.url=http://61.169.120.202:28080/api/device/query/query/channel/carNo/{carNo}
 wvp.channel.list.img.url=http://61.169.120.202:28080/api/device/query/snap/
 wvp.channel.play.url =http://61.169.120.202:1091/rtp/
+wvp.channel.live.broadcast.url=http://61.169.120.202:28080/#/play/wasm/ws%3A%2F%2F192.168.169.100%3A1091%2Frtp%2F{device}_{channel}.live.flv
 wvp.channel.history.list.url=http://61.169.120.202:28080/api/gb_record/query/{device}/{channel}?startTime={startTimeStr}&endTime={endTimeStr}
+
 #客流图像
 passengerFlow.url = http://58.247.254.118:9999/images/
 #DSM图像视频
@@ -161,7 +161,7 @@ function queryChannelByCarNo(treeNode, obj) {
                 $.each(rep.data, function (index, node) {
                     html += "<tr><td>" + node.channelId + "</td><td>" + node.deviceId + "</td><td>" + node.name + "</td><td>" + getBigSnap(rep.channelImageURL, node.deviceId, node.channelId) + "</td><td>" + node.manufacture;
                     html += "</td><td>" + hasAudioText(node.hasAudio) + "</td><td>" + wvpStatusText(node.status) + "</td><td><button class=\"layui-btn layui-btn-primary layui-border\" onclick=\"playWvpVideo('";
-                    html += rep.wvpPlayURL + "','" + node.deviceId + "','" + node.channelId + "')\">播放</button><button class=\"layui-btn layui-btn-primary layui-border\" onclick=\"deviceVedioPage('" + node.deviceId + "','" + node.channelId + "')\">设备录像</button></td></tr>";
+                    html += rep.wvpLiveBroadcast + "','" + node.deviceId + "','" + node.channelId + "')\">播放</button><button class=\"layui-btn layui-btn-primary layui-border\" onclick=\"deviceVedioPage('" + node.deviceId + "','" + node.channelId + "')\">设备录像</button></td></tr>";
                 });
             }
@@ -189,40 +189,19 @@ function getBigSnap(imageURL, deviceId, channelId) {
 function playWvpVideo(playURL, deviceId, channelId) {
     var idDiv = "video_" + (Date.now());
     var html = "'<div id='" + idDiv + "' style='padding-top: 0;'></div>'";
+    playURL = playURL.replace("{device}",deviceId).replace("{channel}",channelId);
-    let player = null;
-    var myVar = null;
-    var playURL1 = playURL + deviceId + "_" + channelId + ".live.mp4";
     var index = layer.open({
-        type: 1,
+        type: 2,
         title: "视频播放",
         area: ['1000px', '650px'],
         height: '800px',
-        content: html,
+        content: playURL,
         success: function (layero, index, that) {
-            player = playVideo(playURL1, idDiv);
-
-            myVar = setInterval(function () {
-                player = playVideo(playURL1, idDiv);
-
-            }, 300000);
-
-
-        },
-        beforeEnd: function (layero, index, that) {
-            if (player) {
-                player = null;
-            }
-
-            if (myVar) {
-                window.clearInterval(myVar);
-                myVar = null;
-            }
-
-            $("#" + idDiv).html("");
         }
     });
+
 }
 function playVideo(url, ID) {