2025-12-16 zwy 优化机场重启后视频推流。

zhaowenyu

2025-12-16 06837debd4f84d57c33083d395984fa2fb9bd306

2025-12-16 zwy 优化机场重启后视频推流。

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java

@@ -86,7 +86,14 @@

        boolean isExist = deviceService.checkDeviceOnline(sn);
        if (!isExist) {
            return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
            return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(), CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
        }
        // 重启机场时清redis视频直播地址，机场重启不掉线。但是流停了。
        if(RemoteControlMethodEnum.DEVICE_REBOOT == controlMethodEnum) {
            RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
            RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
            // 重启机场时，关闭飞行器
            this.controlDock(sn,"drone_close",null);
        }
        String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + sn + TopicConst.SERVICES_SUF;
        String bid = UUID.randomUUID().toString();
@@ -123,11 +130,7 @@
            //关闭，摄像头为舱外；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
            _deviceService.setRedisCameraPosition(sn,1);
        }
        // 重启机场时清redis视频直播地址，机场重启不掉线。但是流停了。
        if(RemoteControlMethodEnum.DEVICE_REBOOT == controlMethodEnum) {
            RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
            RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
        }


        return ResponseResult.success();
    }

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java

@@ -1,11 +1,18 @@
package com.ard.sample.manage.service.impl;

import com.ard.common.core.domain.model.LoginUser;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.common.utils.SecurityUtils;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.component.websocket.handler.LiveStreamHandler;
import com.ard.sample.manage.model.dto.DeviceDTO;
import com.ard.sample.manage.model.dto.LiveDTO;
import com.ard.sample.manage.model.dto.LiveTypeDTO;
import com.ard.sample.manage.service.IDeviceService;
import com.ard.sample.manage.service.ILiveStreamService;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +40,19 @@
    @Autowired
    protected ObjectMapper _objectMapper;

    @Autowired
    private LiveStreamHandler _liveStreamHandler;

    @Autowired
    private ILiveStreamService _liveStreamService;

    /**
     * 定时任务，每2秒取一次机场设备的在线状态，如已离线更新状态
     * */
    @Scheduled(cron = "0/2 * * * * ?")
    public void cronOnlineTask() {
        List<DeviceDTO> devicesList = _deviceService.getDevicesTopoForWeb();
        LoginUser loginUser = SecurityUtils.getLoginUser();
        for (DeviceDTO device : devicesList) {
            //String key = "online:" + device.getDeviceSn();
            //System.out.println("在线状态："+RedisOpsUtils.checkExist(key));
@@ -49,11 +63,18 @@
                RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getDeviceSn());
                RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getDeviceSn());
            }
            else {
                StartLiveStreaming(device.getDeviceSn());
            }
            if(!_deviceService.checkDeviceOnline(device.getChildDeviceSn())){
                _deviceService.updateWorkType(device.getChildDeviceSn(), 6L);
                RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
                RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getChildDeviceSn());
            }
            else{
                StartLiveStreaming(device.getChildDeviceSn());
            }

        }
    }

@@ -110,4 +131,40 @@

        return jsonString;
    }

    public void StartLiveStreaming(String sn) {
        //调用开始直播
        ResponseResult rlive = null;
        String resultLive = "";
        try {
            // 获取直播参数
            LiveTypeDTO param = _liveStreamHandler.getLiveParam(sn);
            // 如果存在直播则读取直播地址返回
            if (RedisOpsUtils.checkExist(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn)) {
                resultLive = String.valueOf(RedisOpsUtils.get(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn));
//                log.info("SN: {}-redis中存在相机的播放地址信息，直接返回地址！", sn);
            } else {
//                log.info("SN: {}-redis中未找到相机的播放地址信息！停止直播后再开启直播", sn);
                _liveStreamHandler.StopLiveStreaming(sn);
                // 如果不存在直播，则开始直播，并返回直播地址
                rlive = _liveStreamService.liveStart(param);
                if (rlive.getCode() == 0) {
                    // 直播成功后，在redis中存一个标记，将videoid保留，留给停止直播使用
                    log.info("SN: {}-开启直播成功！", sn);
                    rlive.setGateway(sn);
                    rlive.setType(MessageType.LIVESTREAM.getType());
                    resultLive = _objectMapper.writeValueAsString(rlive);
                    RedisOpsUtils.set(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn, resultLive);
                    LiveDTO live = (LiveDTO) rlive.getData();
                    Boolean isWeb = _deviceService.updateWebrtcUrl(sn,live.getWebrtcUrl());
//                    if (isWeb) {
//                        log.info("SN: {}-更新webrtc地址成功！", sn);
//                    }
                }
            }
        } catch (Exception e) {
            log.info("订时任务推流-SN: {}-开启直播失败！原因：{}", sn, e.getMessage());
            e.printStackTrace();
        }
    }
}