修改超时时间

liujun001
1 parent 42de05ec
Showing 2 changed files with 8 additions and 3 deletions
src/main/java/com/bsth/service/impl/videoimpl/VideoServiceImpl.java
src/main/resources/static/pages/video/video.js
@@ -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);
@@ -307,7 +307,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 +318,8 @@ function deviceVidemoQueryHistory(device, channel, $deviceVideoDiv, idDiv) {
             $("#deviceVideoTbody", $deviceVideoDiv).html(html);
             closeLoading();
+        }else{
+            closeLoading();
         }
     });
 }