Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd

 src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java

File was renamed from src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -1,12 +1,12 @@
package com.genersoft.iot.vmp.media.zlm.dto;
package com.genersoft.iot.vmp.media.bean;


import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.util.ObjectUtils;

@Schema(description = "流媒体服务信息")
public class MediaServerItem{
public class MediaServer {

    @Schema(description = "ID")
    private String id;
@@ -31,6 +31,18 @@

    @Schema(description = "RTMP端口")
    private int rtmpPort;

    @Schema(description = "flv端口")
    private int flvPort;

    @Schema(description = "https-flv端口")
    private int flvSSLPort;

    @Schema(description = "ws-flv端口")
    private int wsFlvPort;

    @Schema(description = "wss-flv端口")
    private int wsFlvSSLPort;

    @Schema(description = "RTMPS端口")
    private int rtmpSSlPort;
@@ -85,18 +97,24 @@

    @Schema(description = "录像存储路径")
    private String recordPath;
    @Schema(description = "类型： zlm/abl")
    private String type;

    public MediaServerItem() {
    public MediaServer() {
    }

    public MediaServerItem(ZLMServerConfig zlmServerConfig, String sipIp) {
    public MediaServer(ZLMServerConfig zlmServerConfig, String sipIp) {
        id = zlmServerConfig.getGeneralMediaServerId();
        ip = zlmServerConfig.getIp();
        hookIp = ObjectUtils.isEmpty(zlmServerConfig.getHookIp())? sipIp: zlmServerConfig.getHookIp();
        sdpIp = ObjectUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp();
        streamIp = ObjectUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp();
        httpPort = zlmServerConfig.getHttpPort();
        flvPort = zlmServerConfig.getHttpPort();
        wsFlvPort = zlmServerConfig.getHttpPort();
        httpSSlPort = zlmServerConfig.getHttpSSLport();
        flvSSLPort = zlmServerConfig.getHttpSSLport();
        wsFlvSSLPort = zlmServerConfig.getHttpSSLport();
        rtmpPort = zlmServerConfig.getRtmpPort();
        rtmpSSlPort = zlmServerConfig.getRtmpSslPort();
        rtpProxyPort = zlmServerConfig.getRtpProxyPort();
@@ -318,4 +336,44 @@
    public void setRecordPath(String recordPath) {
        this.recordPath = recordPath;
    }

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }

    public int getFlvPort() {
        return flvPort;
    }

    public void setFlvPort(int flvPort) {
        this.flvPort = flvPort;
    }

    public int getFlvSSLPort() {
        return flvSSLPort;
    }

    public void setFlvSSLPort(int flvSSLPort) {
        this.flvSSLPort = flvSSLPort;
    }

    public int getWsFlvPort() {
        return wsFlvPort;
    }

    public void setWsFlvPort(int wsFlvPort) {
        this.wsFlvPort = wsFlvPort;
    }

    public int getWsFlvSSLPort() {
        return wsFlvSSLPort;
    }

    public void setWsFlvSSLPort(int wsFlvSSLPort) {
        this.wsFlvSSLPort = wsFlvSSLPort;
    }
}