潘钊 / bsth_control · Commits

Commit a968f4e5b1bc7f4b8aebc43224b7ca89b804e02a

Authored by liujun001
1 parent 42de05ec
build: skipped

修改超时时间

Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
src/main/java/com/bsth/service/impl/videoimpl/VideoServiceImpl.java
  View file @a968f4e
... ... @@ -280,8 +280,8 @@ public class VideoServiceImpl implements VideoService {
280 280 }
281 281 //超时时间
282 282 RequestConfig requestConfig = RequestConfig.custom()
283   - .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
284   - .setSocketTimeout(3500).build();
  283 + .setConnectTimeout(12500).setConnectionRequestTimeout(12000)
  284 + .setSocketTimeout(13500).build();
285 285 get.setConfig(requestConfig);
286 286  
287 287 response = httpClient.execute(get);
... ...
src/main/resources/static/pages/video/video.js
  View file @a968f4e
... ... @@ -307,7 +307,10 @@ function deviceVidemoQueryHistory(device, channel, $deviceVideoDiv, idDiv) {
307 307 if (resp.status === "SUCCESS") {
308 308 var html = "<tr>";
309 309 $.each(resp.data, function (index, node) {
310   - 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>";
  310 + if(isEmpty(node.filePath)){
  311 + node.filePath=node.startTime+"_"+index;
  312 + }
  313 + 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>";
311 314 if (index % 2 === 1) {
312 315 html += "</tr><tr>";
313 316 }
... ... @@ -315,6 +318,8 @@ function deviceVidemoQueryHistory(device, channel, $deviceVideoDiv, idDiv) {
315 318  
316 319 $("#deviceVideoTbody", $deviceVideoDiv).html(html);
317 320 closeLoading();
  321 + }else{
  322 + closeLoading();
318 323 }
319 324 });
320 325 }
... ...