统一风格

rain

2024-06-14 8d9a2d656e4ae007590c622e5f7c228adacdca49

 src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java

@@ -53,17 +53,20 @@
    private IDeviceRedisService deviceRedisService;

    @Override
    public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId) {
    public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId,String sn) {

        // Query all devices in this workspace.
        //查询该工作区中的所有设备。
        List<DeviceDTO> devicesList = deviceService.getDevicesByParams(
                DeviceQueryParam.builder()
                        .workspaceId(workspaceId)
                        .deviceSn(sn)
                        .domains(List.of(DeviceDomainEnum.SUB_DEVICE.getVal(), DeviceDomainEnum.DOCK.getVal()))
                        .build());

        // Query the live capability of each drone.
        return devicesList.stream()
                //过滤出在线设备
                .filter(device -> deviceRedisService.checkDeviceOnline(device.getDeviceSn()))
                .map(device -> CapacityDeviceDTO.builder()
                        .name(Objects.requireNonNullElse(device.getNickname(), device.getDeviceName()))
@@ -90,7 +93,13 @@

    @Override
    public ResponseResult liveStart(LiveTypeDTO liveParam) {

//        String streamId_2 = liveParam.getVideoId().replace("/","_");
//        String streamId_1 = liveParam.getVideoId().replace("_","/");
//        liveParam.setVideoId(streamId_2);

        // Check if this lens is available live.
        //检查镜头是否可用
        ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
        if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
            return responseResult;
@@ -98,9 +107,19 @@

        DeviceDTO data = (DeviceDTO)responseResult.getData();
        // target topic
        //thing/product/{gateway_sn}/services   云平台向设备发送的服务
        String respTopic = THING_MODEL_PRE + PRODUCT +
                data.getDeviceSn() + SERVICES_SUF;

        //获取返回结果
        ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);

        //相机已经在直播中，请勿重复开启直播
        if(receiveReply.getResult() == 513003) {
            LiveDTO live = new LiveDTO();
            live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
            return ResponseResult.success(live);
        }

        if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
            return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
@@ -109,9 +128,11 @@
        LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
        LiveDTO live = new LiveDTO();

        //对不同的协议类型做处理
        switch (urlType) {
            case RTMP:
                live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
//                live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
                live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
                break;
            case GB28181:
                LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
@@ -142,7 +163,10 @@
            return responseResult;
        }

        //thing/product/{gateway_sn}/services
        String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;

        videoId = videoId.replace("_","/");

        ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
        if (receiveReply.getResult() != 0) {
@@ -212,6 +236,7 @@

    /**
     * Check if this lens is available live.
     * 检查镜头是否可用
     * @param videoId
     * @return
     */
@@ -293,6 +318,7 @@

    /**
     * Send a message to the pilot via mqtt to start the live streaming.
     *通过mqtt向飞行员发送消息以启动直播。
     * @param topic
     * @param liveParam
     * @return
@@ -343,4 +369,4 @@
        return messageSender.publishWithReply(ServiceReply.class, topic, response);
    }

}
}