合并分支

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -947,7 +947,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 // 获取当前时间的后10分钟时间
                 LocalDateTime afterTenMinutes = currentTime.plusMinutes(10);
                 // 格式化时间
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
                 playbackVo.setBeginTime(beforeTenMinutes.format(formatter));
                 playbackVo.setEndTime(afterTenMinutes.format(formatter));
                 //对象转换json字符串

vehicle-admin/src/main/java/com/ozs/web/core/config/GetCameraPreviewURL.java

@@ -144,6 +144,7 @@ public class GetCameraPreviewURL {
         jsonBody.put("beginTime", "2023-11-29T14:00:00.000+08:00");
         jsonBody.put("endTime","2023-11-29T14:20:00.000+08:00");
         jsonBody.put("protocol","rtsp");
+        jsonBody.put("expand","streamform=rtp");
         String body = jsonBody.toJSONString();
         /**
          * STEP6：调用接口