|
|
|
|
@ -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) {
|
|
|
|
|
|