roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/录制计划

Browse Source
This commit is contained in:
648540858
2024-11-27 14:20:59 +08:00
parent 57e1934f02 e198b2f66c
commit d3f53db160
15 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpInfo.java
View File

@@ -175,15 +175,18 @@ public class SendRtpInfo {
return sendRtpItem;
}
public static SendRtpInfo getInstance(Integer localPort, MediaServer mediaServer, String ip, int port, String ssrc,
String deviceId, String platformId, Integer channelId, boolean isTcp, boolean rtcp,
public static SendRtpInfo getInstance(Integer localPort, MediaServer mediaServer, String ip, Integer port, String ssrc,
String deviceId, String platformId, Integer channelId, Boolean isTcp, Boolean rtcp,
String serverId) {
if (localPort == 0) {
return null;
}
SendRtpInfo sendRtpItem = new SendRtpInfo();
sendRtpItem.setIp(ip);
sendRtpItem.setPort(port);
if(port != null) {
sendRtpItem.setPort(port);
}
sendRtpItem.setSsrc(ssrc);
if (deviceId != null) {
sendRtpItem.setTargetId(deviceId);

5
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SyncStatus.java
View File

@@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.gb28181.bean;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.Instant;
/**
* 摄像机同步状态
* @author lin
@@ -23,4 +25,7 @@ public class SyncStatus {
@Schema(description = "是否同步中")
private Boolean syncIng;
@Schema(description = "时间")
private Instant time;
}