From 0f2c1b35813fd47dd33f3757f59758cfe8edf3a2 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 17 Dec 2025 14:40:45 +0800
Subject: [PATCH] 2025-12-16 zwy 优化视频直播开始与停止,加打印失败日志

---
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index 9b8d260..efc6fba 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/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);

--
Gitblit v1.9.3