Home Explore Help
Sign In
ytrd-project-management
/
VehicleMonitor
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

第三方接口修改

gao.qiang 2 years ago
parent
20ed2bf525
commit
0f91291bd5
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

+ 1 - 1
vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
View File 

@@ -279,7 +279,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
 
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
 
         String s = HttpUtils.sendGet(historyUrl + "/api/record/flv/list", param);
 
         String s = HttpUtils.sendGet(historyUrl + "/api/record/flv/list", param);
 
         // 视频拼接
 
         // 视频拼接
 
-        if (!StringUtils.isBlank(s) || "null".equals(s)) {
 
+        if (!StringUtils.isBlank(s) && !"null".equals(s) && !s.startsWith("<!DOCTYPE html>")) {
 
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
 
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
 
             if (ObjectUtils.isEmpty(maps)) {
 
             if (ObjectUtils.isEmpty(maps)) {
 
                 return null;
 
                 return null;