2025-12-16 zwy 优化开启直播时判断直播参数是否为空；

zhaowenyu

2025-12-18 b1ea8a05f56f92c66dc478af5100bc1b1cb764d3

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

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

import com.alibaba.fastjson2.JSONObject;
import com.ard.common.core.domain.model.LoginUser;
import com.ard.common.utils.SecurityUtils;
import com.ard.device.camera.domain.ArdCamera;
import com.ard.device.camera.service.IArdCameraService;
import com.ard.device.channel.domain.ArdChannel;
@@ -369,6 +371,7 @@
    //region 单独写一个方法做权限验证，由于有好多定时任务也在实时获取设备列表，原方法不适用再添加权限注解
    @Override
    public List<DeviceDTO> getDockList(String nickname) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        List<DeviceDTO> devicesList = this.getDockListByParams(
                DeviceQueryParam.builder()
                        .domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))
@@ -376,8 +379,8 @@
                        .build());
        // 在獲取设备列表时，顺便获取直播地址
        for(DeviceDTO devices : devicesList){
            _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn());
            _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn());
            _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn(), loginUser.getUserId().toString());
            _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn(), loginUser.getUserId().toString());
            ArdCamera ardCamera = new ArdCamera();
            ardCamera.setDockId(devices.getId());
            List<ArdCamera> ardCameraList = _cameraService.selectArdCameraList(ardCamera);
@@ -1196,23 +1199,30 @@
        return ResponseResult.success();
    }

    /**
     * 属性设置
     * */
    @Override
    public void devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param) {
    public ResponseResult devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param) {
        boolean dockOnline = this.checkDeviceOnline(dockSn);
        if (!dockOnline) {
            throw new RuntimeException(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
            return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(),"机场" + CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
            //throw new RuntimeException(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
        }
        DeviceDTO deviceDTO = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + dockSn);
        boolean deviceOnline = this.checkDeviceOnline(deviceDTO.getChildDeviceSn());
        if (!deviceOnline) {
            throw new RuntimeException("Device is offline.");
            return ResponseResult.error(2222,"无人机" + CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
            //throw new RuntimeException("Device is offline.");
            // CommonErrorEnum.DEVICE_OFFLINE.getErrorCode()
        }

        // Make sure the data is valid.
        BasicDeviceProperty basicDeviceProperty = objectMapper.convertValue(param, propertyEnum.getClazz());
        boolean valid = basicDeviceProperty.valid();
        if (!valid) {
            throw new IllegalArgumentException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
            return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
            // throw new IllegalArgumentException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
        }

        String topic = THING_MODEL_PRE + PRODUCT + dockSn + PROPERTY_SUF + SET_SUF;
@@ -1220,12 +1230,14 @@
                (OsdSubDeviceReceiver) RedisOpsUtils.get(RedisConst.OSD_PREFIX + deviceDTO.getChildDeviceSn());
        if (!param.isObject()) {
            this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), param));
            return;
            return ResponseResult.success();
//            return;
        }

        if(param.size()==1){
            this.deviceOnePropertySetSilent(topic,propertyEnum,param);
            return;
            return ResponseResult.success();
//            return;
        }
//        if(Objects.equals(param.fieldNames().next(), "silent_mode"))
//        {
@@ -1242,7 +1254,7 @@

            this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), node));
        }

        return ResponseResult.success();
    }

    /**
@@ -1504,7 +1516,7 @@
            CommonTopicReceiver<Map<String,Integer>> stateReceiver = new CommonTopicReceiver<>();
            stateReceiver.setTid(UUID.randomUUID().toString());
            stateReceiver.setBid(UUID.randomUUID().toString());
            stateReceiver.setType(MessageType.LIVESTREAM.getType());
            stateReceiver.setType(MessageType.LIVESTATUS.getType());
            stateReceiver.setGateway(sn);
            stateReceiver.setTimestamp(System.currentTimeMillis());
            Map<String,Integer> live_status = new HashMap<>();