Merge branch 'master' of ssh://git.swordlost.top:222/SikongJueluo/FPGA_WebLab

server/src/Controllers/VideoStreamController.cs

@@ -3,39 +3,22 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using System.Security.Claims;
-using Database;
 using DotNext;
+using server.Services;
 
 /// <summary>
 /// 视频流控制器，支持动态配置摄像头连接
 /// </summary>
 [ApiController]
 [Authorize]
+[EnableCors("Users")]
 [Route("api/[controller]")]
 public class VideoStreamController : ControllerBase
 {
     private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-    private readonly server.Services.HttpVideoStreamService _videoStreamService;
 
-    /// <summary>
-    /// 分辨率配置请求模型
-    /// </summary>
-    public class ResolutionConfigRequest
-    {
-        /// <summary>
-        /// 宽度
-        /// </summary>
-        [Required]
-        [Range(640, 1920, ErrorMessage = "宽度必须在640-1920范围内")]
-        public int Width { get; set; }
-
-        /// <summary>
-        /// 高度
-        /// </summary>
-        [Required]
-        [Range(480, 1080, ErrorMessage = "高度必须在480-1080范围内")]
-        public int Height { get; set; }
-    }
+    private readonly HttpVideoStreamService _videoStreamService;
+    private readonly Database.UserManager _userManager;
 
     public class AvailableResolutionsResponse
     {
@@ -49,10 +32,40 @@ public class VideoStreamController : ControllerBase
     /// 初始化HTTP视频流控制器
     /// </summary>
     /// <param name="videoStreamService">HTTP视频流服务</param>
-    public VideoStreamController(server.Services.HttpVideoStreamService videoStreamService)
+    /// <param name="userManager">用户管理服务</param>
+    public VideoStreamController(
+        HttpVideoStreamService videoStreamService, Database.UserManager userManager)
     {
         logger.Info("创建VideoStreamController，命名空间：{Namespace}", this.GetType().Namespace);
         _videoStreamService = videoStreamService;
+        _userManager = userManager;
+    }
+
+    private Optional<string> TryGetBoardId()
+    {
+        var userName = User.FindFirstValue(ClaimTypes.Name);
+        if (string.IsNullOrEmpty(userName))
+        {
+            logger.Error("User name not found in claims.");
+            return Optional<string>.None;
+        }
+
+        var userRet = _userManager.GetUserByName(userName);
+        if (!userRet.IsSuccessful || !userRet.Value.HasValue)
+        {
+            logger.Error("User not found.");
+            return Optional<string>.None;
+        }
+
+        var user = userRet.Value.Value;
+        var boardId = user.BoardID;
+        if (boardId == Guid.Empty)
+        {
+            logger.Error("No board bound to this user.");
+            return Optional<string>.None;
+        }
+
+        return boardId.ToString();
     }
 
     private Optional<string> TryGetBoardId()
@@ -93,11 +106,10 @@ public class VideoStreamController : ControllerBase
     /// 获取 HTTP 视频流服务状态
     /// </summary>
     /// <returns>服务状态信息</returns>
-    [HttpGet("Status")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
+    [HttpGet("ServiceStatus")]
+    [ProducesResponseType(typeof(VideoStreamServiceStatus), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
-    public IResult GetStatus()
+    public IResult GetServiceStatus()
     {
         try
         {
@@ -115,8 +127,7 @@ public class VideoStreamController : ControllerBase
     }
 
     [HttpGet("MyEndpoint")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(VideoStreamEndpoint), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
     public IResult MyEndpoint()
     {
@@ -139,7 +150,6 @@ public class VideoStreamController : ControllerBase
     /// </summary>
     /// <returns>连接测试结果</returns>
     [HttpPost("TestConnection")]
-    [EnableCors("Users")]
     [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
     public async Task<IResult> TestConnection()
@@ -172,14 +182,16 @@ public class VideoStreamController : ControllerBase
         }
     }
 
-    [HttpPost("DisableTransmission")]
-    public async Task<IActionResult> DisableHdmiTransmission()
+    [HttpPost("SetVideoStreamEnable")]
+    [ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
+    public async Task<IActionResult> SetVideoStreamEnable(bool enable)
     {
         try
         {
             var boardId = TryGetBoardId().OrThrow(() => new ArgumentException("Board ID is required"));
 
-            await _videoStreamService.DisableHdmiTransmissionAsync(boardId.ToString());
+            await _videoStreamService.SetVideoStreamEnableAsync(boardId.ToString(), enable);
             return Ok($"HDMI transmission for board {boardId} disabled.");
         }
         catch (Exception ex)
@@ -241,7 +253,7 @@ public class VideoStreamController : ControllerBase
     /// <returns>支持的分辨率列表</returns>
     [HttpGet("SupportedResolutions")]
     [EnableCors("Users")]
-    [ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(AvailableResolutionsResponse[]), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
     public IResult GetSupportedResolutions()
     {
@@ -349,4 +361,65 @@ public class VideoStreamController : ControllerBase
             return TypedResults.InternalServerError($"执行自动对焦失败: {ex.Message}");
         }
     }
+
+    /// <summary>
+    /// 配置摄像头连接参数
+    /// </summary>
+    /// <returns>配置结果</returns>
+    [HttpPost("ConfigureCamera")]
+    [EnableCors("Users")]
+    [ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
+    public async Task<IResult> ConfigureCamera()
+    {
+        try
+        {
+            var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
+
+            var ret = await _videoStreamService.ConfigureCameraAsync(boardId);
+
+            if (ret)
+            {
+                return TypedResults.Ok(new { Message = "配置成功" });
+            }
+            else
+            {
+                return TypedResults.BadRequest(new { Message = "配置失败" });
+            }
+        }
+        catch (Exception ex)
+        {
+            logger.Error(ex, "配置摄像头连接失败");
+            return TypedResults.InternalServerError(ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// 分辨率配置请求模型
+    /// </summary>
+    public class ResolutionConfigRequest
+    {
+        /// <summary>
+        /// 宽度
+        /// </summary>
+        [Required]
+        [Range(640, 1920, ErrorMessage = "宽度必须在640-1920范围内")]
+        public int Width { get; set; }
+
+        /// <summary>
+        /// 高度
+        /// </summary>
+        [Required]
+        [Range(480, 1080, ErrorMessage = "高度必须在480-1080范围内")]
+        public int Height { get; set; }
+    }
+
+    public class AvailableResolutionsResponse
+    {
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string Value => $"{Width}x{Height}";
+    }
 }