From 28ca9e7a8e4592e2b5c3ee23713caaaf57de4c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 6 Nov 2023 13:15:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BE=85=E7=A0=81=E6=B5=81?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AE=9E=E5=86=B5=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=A7=82=E4=BC=97=E6=B5=81=E5=AA=92=E4=BD=93=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=8B=89=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/controller/CameraController.java | 2 +- .../main/java/com/zhehekeji/web/service/CameraService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java index 34274d0..5626c3a 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java @@ -180,7 +180,7 @@ public class CameraController { JSONObject streams = new JSONObject(); cameras.forEach(camera -> { JSONObject obj = new JSONObject(); - obj.put("on_demand",false); + obj.put("on_demand",true); obj.put("disable_audio",true); obj.put("url",camera.getRtsp()); streams.put("camera"+camera.getId(),obj); diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 5581b78..42989be 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -70,7 +70,7 @@ public class CameraService { camera.setPassword(configProperties.getCameraConfig().getCameraPassword()); camera.setPort(configProperties.getCameraConfig().getCameraPort()); camera.setUpdateTime(LocalDateTime.now()); - camera.setRtsp("rtsp://"+configProperties.getCameraConfig().getCameraUser()+":"+configProperties.getCameraConfig().getCameraPassword()+"@"+camera.getIp()+":554/cam/realmonitor?channel=1&subtype=0"); + camera.setRtsp("rtsp://"+configProperties.getCameraConfig().getCameraUser()+":"+configProperties.getCameraConfig().getCameraPassword()+"@"+camera.getIp()+":554/h264/ch1/sub/av_stream"); if(StringUtils.isEmpty(camera.getRtcServer())){ camera.setRtcServer("127.0.0.1"); } @@ -92,7 +92,7 @@ public class CameraService { } camera.setPort(configProperties.getCameraConfig().getCameraPort()); camera.setUser(configProperties.getCameraConfig().getCameraUser()); - camera.setRtsp("rtsp://"+configProperties.getCameraConfig().getCameraUser()+":"+configProperties.getCameraConfig().getCameraPassword()+"@"+camera.getIp()+":554/cam/realmonitor?channel=1&subtype=0"); + camera.setRtsp("rtsp://"+configProperties.getCameraConfig().getCameraUser()+":"+configProperties.getCameraConfig().getCameraPassword()+"@"+camera.getIp()+":554/h264/ch1/sub/av_stream"); try { cameraMapper.updateById(camera); } catch (DuplicateKeyException e) {