Merge branch 'pudong_jdk8_wvp' of http://192.168.168.245:8888/panzhaov5/bsth_con…

…trol into pudong_jdk8_wvp

Merge branch 'pudong_jdk8_wvp' of http://192.168.168.245:8888/panzhaov5/bsth_con…
…trol into pudong_jdk8_wvp
徐烜
2 parents b6805369 395d70a8
Showing 5 changed files with 41 additions and 54 deletions
src/main/java/com/bsth/controller/video/VideoController.java
src/main/java/com/bsth/service/impl/videoimpl/VideoServiceImpl.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);
@@ -280,8 +280,8 @@ public class VideoServiceImpl implements VideoService {
             }
             //超时时间
             RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                    .setSocketTimeout(3500).build();
+                    .setConnectTimeout(12500).setConnectionRequestTimeout(12000)
+                    .setSocketTimeout(13500).build();
             get.setConfig(requestConfig);
             response = httpClient.execute(get);
@@ -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;
 }
@@ -74,11 +74,13 @@ sso.http.url.auth= https://112.64.45.51/information/authenticate/authorityAuthen
 wvp.login.user=admin
 wvo.login.pwd=e9bc0e13a8a16cbb07b175d92a113126
-wvp.login.url=http://127.0.0.1:18080/api/user/login
-wvp.channel.list.url=http://127.0.0.1:18080/api/device/query/query/channel/carNo/{carNo}
-wvp.channel.list.img.url=http://127.0.0.1:18080/api/device/query/snap/
-wvp.channel.play.url =http://192.168.169.100:1091/rtp/
-wvp.channel.history.list.url=http://127.0.0.1:18080/api/gb_record/query/{device}/{channel}?startTime={startTimeStr}&endTime={endTimeStr}
+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%2F61.169.120.202%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/
@@ -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,51 +189,26 @@ 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) {
+function playVideo(url, ID,time) {
     return new WebMediaPlayer(url, ID, function () {
     }, {
-        cbUserPtr: this,
-        decodeType: 'auto',
-        openAudio: true,
-        autoplay: true,
-        bigPlay: false,
-        showMode: false
+        autoplay: 1,
+        currentTime:time
     }).play();
 }
@@ -307,7 +282,10 @@ function deviceVidemoQueryHistory(device, channel, $deviceVideoDiv, idDiv) {
         if (resp.status === "SUCCESS") {
             var html = "<tr>";
             $.each(resp.data, function (index, node) {
-                html += "<td><button class=\"layui-btn layui-btn-primary layui-border\" onclick=\"playDeviceVidemoQueryHistory('" + idDiv + "','" + resp.wvpPlayURL + "','" + device + "','" + channel + "','" + node.startTime + "','" + node.endTime + "','" + resp.token + "')\">" + node.filePath + "</button></td>";
+                if(isEmpty(node.filePath)){
+                    node.filePath=node.startTime+"_"+index;
+                }
+                html += "<td><button class=\"layui-btn layui-btn-primary layui-border\" onclick=\"playDeviceVidemoQueryHistory('" + idDiv + "','" + resp.wvpPlayURL + "','" + device + "','" + channel + "','" + node.startTime + "','" + node.endTime + "','" + resp.token + "')\" title='"+ node.filePath+"'>" + node.filePath + "</button></td>";
                 if (index % 2 === 1) {
                     html += "</tr><tr>";
                 }
@@ -315,6 +293,8 @@ function deviceVidemoQueryHistory(device, channel, $deviceVideoDiv, idDiv) {
             $("#deviceVideoTbody", $deviceVideoDiv).html(html);
             closeLoading();
+        }else{
+            closeLoading();
         }
     });
 }
@@ -330,7 +310,7 @@ function playDeviceVidemoQueryHistory(idDiv, url, device, channel, startTime, en
     console.log(url);
     var idDiv1 = "device_video_play_" + (Date.now());
     $("#videoPlay", $("#" + idDiv)).html("<div id='" + idDiv1 + "' style='height:550px;width:99%'></div>")
-    player = playVideo(url, idDiv1);
+    player = playVideo(url, idDiv1,0);
 }
@@ -372,7 +352,7 @@ function skeywebPlayerChannel($skeyewebplayer, carNo) {
             if (rep.data) {
                 let html = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\" class=\"layui-table\"><tbody>";
                 $.each(rep.data, function (index, node) {
-                    html = html + "<tr><td><button class=\"layui-btn layui-btn-primary\" channelNode='" + node.name + "' deviceId='" + node.deviceId + "' channelId='" + node.channelId + "' onclick=\"skeyewebplayerChannelClick('" + rep.wvpPlayURL + "',this)\">" + node.name + "</button></td></tr>";
+                    html = html + "<tr><td><button class=\"layui-btn layui-btn-primary\" channelNode='" + node.name + "' deviceId='" + node.deviceId + "' channelId='" + node.channelId + "'  onclick=\"skeyewebplayerChannelClick('" + rep.wvpLiveBroadcast + "',this)\">" + node.name + "</button></td></tr>";
                 });
                 $("#skeyewebplayerDivChannel", $skeyewebplayer).html(html);
                 closeLoading();
@@ -381,17 +361,16 @@ function skeywebPlayerChannel($skeyewebplayer, carNo) {
     });
 }
-function skeyewebplayerChannelClick(playURL, btn) {
-    console.log(btn);
+function skeyewebplayerChannelClick(playURL, btn,deviceId,channelId) {
     let children = $("#skeyewebplayerDivContent", $("#skeyewebplayer")).children();
     let length = children.length;
     if (length === 1) {
-        displaySkeyewebplayerChannel(children[0], playURL, btn);
+        displaySkeyewebplayerChannel(children[0], playURL, btn,deviceId,channelId);
     } else if (length > 1) {
         for (let i = 0; i < length; i++) {
             let classCss = $(children[i]).attr("class");
             if (classCss.indexOf("skeyewebplayerDivContent_play_selected") > -1) {
-                displaySkeyewebplayerChannel(children[i], playURL, btn);
+                displaySkeyewebplayerChannel(children[i], playURL, btn,deviceId,channelId);
                 break;
             }
         }
@@ -400,19 +379,22 @@ function skeyewebplayerChannelClick(playURL, btn) {
 }
-function displaySkeyewebplayerChannel(htmlNode, playURL, btn) {
+function displaySkeyewebplayerChannel(htmlNode, playURL, btn,deviceId,channelId) {
     loading = loadingFunction();
     let $htmlNode = $(htmlNode);
-
     let $btn = $(btn);
-    $("div[class='skeyewebplayerDiv_title']", $htmlNode).html($btn.attr("channelNode"));
+    deviceId = $btn.attr("deviceId");
+    channelId =  $btn.attr("channelId");
-    let playURL1 = playURL + $btn.attr("deviceId") + "_" + $btn.attr("channelId") + ".live.mp4";
-    $("div[class='skeyewebplayerDiv_play_content']", $htmlNode).html("");
-    playVideo2(playURL1, $("div[class='skeyewebplayerDiv_play_content']", $htmlNode));
+    let htmlObj =  $("div[class='skeyewebplayerDiv_play_content']", $htmlNode);
+    htmlObj.html("");
+    $("div[class='skeyewebplayerDiv_title']", $htmlNode).html($btn.attr("channelNode"));
+    playURL = playURL.replace("{device}",deviceId).replace("{channel}",channelId);
+    let playURL1 = "<iframe  style='width:100%;height:100%;' src ='"+playURL+"'/>";
+    htmlObj.html(playURL1);
     closeLoading();
 }
@@ -449,7 +431,7 @@ function skeyWebPlayer(len, parentId) {
     var html = "";
     for (let i = 0; i < len; i++) {
         html += "<div class='" + classCss + "' id='skeyewebplayerDivContent_play_" + i + "' onclick=\"skeyewebplayerDivContent_play_click(this)\"><div class='skeyewebplayerDiv_title'>";
-        html += "</div><div id='skeyewebplayerDiv_play_content_" + i + "' class='skeyewebplayerDiv_play_content'></div></div>";
+        html += "</div><div id='skeyewebplayerDiv_play_content_" + i + "' class='skeyewebplayerDiv_play_content' style='height: 95%'></div></div>";
     }
     $skeyewebplayerDivContent.html(html);