2 lat temu · 0f91291bd5
--- a/vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
+++ b/vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
@@ -279,7 +279,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 
				         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
			
 
				         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);
			
 
				             if (ObjectUtils.isEmpty(maps)) {
			
 
				                 return null;