2025-12-16 zwy 优化-去掉日志

zhaowenyu

2025-12-16 f3ba49dc3b2793f8a6968a815a2e38b49159045f

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

@@ -1,5 +1,6 @@
package com.ard.sample.manage.service.impl;

import com.ard.sample.common.error.CommonErrorEnum;
import com.ard.sample.common.error.LiveErrorEnum;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.CommonTopicResponse;
@@ -182,6 +183,11 @@
                return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
        }

        // 开始直播时发送机场相机摄像头默认信息（舱外）到所有在线用户,只取机场sn，发机场的摄像头信息
        if(data.getChildDeviceSn()!=null) {
            String sn = data.getDeviceSn();
            deviceService.setRedisCameraPosition(sn, 1);
        }
        return ResponseResult.success(live);
    }

@@ -241,10 +247,53 @@
        ServiceReply receiveReply = this.publishLiveLensChange(respTopic, liveParam);

        if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
            Integer code = receiveReply.getResult();
            if(code == 325003) {
                // 指令响应失败，请重试. 经查询官网，机场3为低配，飞行器不支持红外
                return ResponseResult.error(325003000,LiveErrorEnum.COMMAND_FAILED.getErrorMsg()+"请确认无人机是否支持此功能！");
            }
            return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
        }

        return ResponseResult.success();
    }

    @Override
    public ResponseResult<List<String>> getLiveLens(String sn) {
        List<String> videoTypes = new ArrayList<>();
        // 检查设备是否在线
        if (!deviceService.checkDeviceOnline(sn)) {
            log.info("SN: {}-设备不在线，请检查网络连接！", sn);
            // 抛弃出异常，给调用者处理
            //throw new Exception("设备不在线，请检查网络连接！");
            return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(),CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
        }
        // 读取直播能力拼接参数
        List<CapacityDeviceDTO> devicesList = getLiveCapacity();
        if (devicesList == null || devicesList.isEmpty()) {
            log.info("SN: {}-未获得设备直播能力！", sn);
            // 抛弃出异常，给调用者处理
            //throw new Exception("未获得设备直播能力！");
            return ResponseResult.error(22222200,"未获得设备直播能力！");
        }
        for (CapacityDeviceDTO device : devicesList) {
            if (!device.getSn().equals(sn)) {
                continue;
            }
            List<CapacityCameraDTO> camerasList = device.getCamerasList();
            for (CapacityCameraDTO camera : camerasList) {
                // 机场3中飞行器，没有name，需要其他条件确定主摄像头参数
                for (CapacityVideoDTO video : camera.getVideosList()) {
                    if (video.getSwitchVideoTypes().size() == 1 && camera.getName() == null) {
                        continue;
                    }
                    videoTypes = video.getSwitchVideoTypes();

                }
            }
        }

        return ResponseResult.success(videoTypes);
    }

    @Override
@@ -268,6 +317,10 @@
        if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
            return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
        }
        // 将切换相机摄像头信息到redis
        Integer camera_position = liveParam.getCameraPosition();
        String sn = responseResult.getData().getDeviceSn();
        deviceService.setRedisCameraPosition(sn, camera_position);

        return ResponseResult.success();
    }