648540858
2023-06-27 c7d15150237c946fbb4f5547dab0018a5f573d88
增加redis通道
3个文件已修改
1个文件已添加
111 ■■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/bean/MessageForPushChannel.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -101,6 +101,21 @@
     */
    public static final String VM_MSG_STREAM_PUSH_REQUESTED = "VM_MSG_STREAM_PUSH_REQUESTED";
    /**
     * redis 消息通知上级平台开始观看流
     */
    public static final String VM_MSG_STREAM_START_PLAY_NOTIFY = "VM_MSG_STREAM_START_PLAY_NOTIFY";
    /**
     * redis 消息通知上级平台停止观看流
     */
    public static final String VM_MSG_STREAM_STOP_PLAY_NOTIFY = "VM_MSG_STREAM_STOP_PLAY_NOTIFY";
    /**
     * redis 消息接收关闭一个推流
     */
    public static final String VM_MSG_STREAM_PUSH_CLOSE_REQUESTED = "VM_MSG_STREAM_PUSH_CLOSE_REQUESTED";
    /**
     * redis 消息通知平台通知设备推流结果
src/main/java/com/genersoft/iot/vmp/service/bean/MessageForPushChannel.java
@@ -1,7 +1,5 @@
package com.genersoft.iot.vmp.service.bean;
import java.util.stream.Stream;
/**
 * 当上级平台
 * @author lin
@@ -29,9 +27,14 @@
    private String gbId;
    /**
     * 请求的平台ID
     * 请求的平台国标编号
     */
    private String platFormId;
    /**
     * 请求的平台自增ID
     */
    private String platFormIndex;
    /**
     * 请求平台名称
@@ -128,4 +131,12 @@
    public void setMediaServerId(String mediaServerId) {
        this.mediaServerId = mediaServerId;
    }
    public String getPlatFormIndex() {
        return platFormIndex;
    }
    public void setPlatFormIndex(String platFormIndex) {
        this.platFormIndex = platFormIndex;
    }
}
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
@@ -97,6 +97,9 @@
                cmdCode = 32;
                break;
            case "stop":
                horizonSpeed = 0;
                verticalSpeed = 0;
                zoomSpeed = 0;
                break;
            default:
                break;
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
New file
@@ -0,0 +1,76 @@
package com.genersoft.iot.vmp.vmanager.rtp;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@SuppressWarnings("rawtypes")
@Tag(name = "第三方服务对接")
@RestController
@RequestMapping("/api/rtp")
public class RtpController {
    @Autowired
    private ZlmHttpHookSubscribe zlmHttpHookSubscribe;
    @Autowired
    private IMediaServerService mediaServerService;
    @Autowired
    private VersionInfo versionInfo;
    @Autowired
    private SipConfig sipConfig;
    @Autowired
    private UserSetting userSetting;
    @Autowired
    private IDeviceService deviceService;
    @Autowired
    private IDeviceChannelService channelService;
    @Autowired
    private IStreamPushService pushService;
    @Autowired
    private IStreamProxyService proxyService;
    @Value("${server.port}")
    private int serverPort;
    @Autowired
    private IRedisCatchStorage redisCatchStorage;
    @GetMapping(value = "/send/ready")
    @ResponseBody
    @Operation(summary = "为发送视频流获取信息")
    public List<MediaServerItem> getMediaServerList(Boolean onlySender, ) {
        MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad(null);
        if (mediaServerItem == null) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(),"没有可用的MediaServer");
        }
        mediaServerService.openRTPServer()
        return mediaServerService.getAll();
    }
}