feat: 完成数码管websocket通信

2025-08-14 20:25:32 +08:00
parent 7bfc362b1f
commit 56eeb5dce3
12 changed files with 444 additions and 243 deletions
--- a/server/src/Controllers/ExamController.cs
+++ b/server/src/Controllers/ExamController.cs
@@ -229,12 +229,12 @@ public class ExamController : ControllerBase
    [Authorize]
    [HttpPost("commit/{examId}")]
    [EnableCors("Users")]
-    [ProducesResponseType(typeof(Resource), StatusCodes.Status201Created)]
+    [ProducesResponseType(typeof(ResourceInfo), StatusCodes.Status201Created)]
    [ProducesResponseType(StatusCodes.Status400BadRequest)]
    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public async Task<IActionResult> SubmitHomework(string examId, IFormFile file)
+    public async Task<IActionResult> Commit(string examId, IFormFile file)
    {
        if (string.IsNullOrWhiteSpace(examId))
            return BadRequest("实验ID不能为空");
@@ -287,7 +287,7 @@ public class ExamController : ControllerBase
                return StatusCode(StatusCodes.Status500InternalServerError, $"提交作业失败: {commitResult.Error.Message}");
            }

-            var commit = commitResult.Value;
+            var commit = new ResourceInfo(commitResult.Value);

            logger.Info($"用户 {userName} 成功提交实验 {examId} 的作业，Commit ID: {commit.ID}");
            return CreatedAtAction(nameof(GetCommitsByExamId), new { examId = examId }, commit);
@@ -307,7 +307,7 @@ public class ExamController : ControllerBase
    [Authorize]
    [HttpGet("commits/{examId}")]
    [EnableCors("Users")]
-    [ProducesResponseType(typeof(Resource[]), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ResourceInfo[]), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status400BadRequest)]
    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -352,8 +352,7 @@ public class ExamController : ControllerBase
                logger.Error($"获取提交记录时出错: {commitsResult.Error.Message}");
                return StatusCode(StatusCodes.Status500InternalServerError, $"获取提交记录失败: {commitsResult.Error.Message}");
            }
-
-            var commits = commitsResult.Value;
+            var commits = commitsResult.Value.Select(x => new ResourceInfo(x)).ToArray();

            logger.Info($"成功获取用户 {userName} 在实验 {examId} 中的提交记录，共 {commits.Length} 条");
            return Ok(commits);
--- a/server/src/Controllers/ResourceController.cs
+++ b/server/src/Controllers/ResourceController.cs
@@ -82,20 +82,10 @@ public class ResourceController : ControllerBase
                return StatusCode(StatusCodes.Status500InternalServerError, $"添加资源失败: {result.Error.Message}");
            }

-            var resource = result.Value;
-            var resourceInfo = new ResourceInfo
-            {
-                ID = resource.ID.ToString(),
-                Name = resource.ResourceName,
-                Type = resource.ResourceType,
-                Purpose = resource.Purpose,
-                UploadTime = resource.UploadTime,
-                ExamID = resource.ExamID,
-                MimeType = resource.MimeType
-            };
+            var resourceInfo = new ResourceInfo(result.Value);

            logger.Info($"成功添加资源: {request.ResourceType}/{request.ResourcePurpose}/{file.FileName}");
-            return CreatedAtAction(nameof(GetResourceById), new { resourceId = resource.ID }, resourceInfo);
+            return CreatedAtAction(nameof(GetResourceById), new { resourceId = resourceInfo.ID }, resourceInfo);
        }
        catch (Exception ex)
        {
@@ -168,16 +158,7 @@ public class ResourceController : ControllerBase

                var allResources = userResourcesResult.Value.Concat(templateResourcesResult.Value)
                    .OrderByDescending(r => r.UploadTime);
-                var mergedResourceInfos = allResources.Select(r => new ResourceInfo
-                {
-                    ID = r.ID.ToString(),
-                    Name = r.ResourceName,
-                    Type = r.ResourceType,
-                    Purpose = r.Purpose,
-                    UploadTime = r.UploadTime,
-                    ExamID = r.ExamID,
-                    MimeType = r.MimeType
-                }).ToArray();
+                var mergedResourceInfos = allResources.Select(r => new ResourceInfo(r)).ToArray();

                logger.Info($"成功获取资源列表，共 {mergedResourceInfos.Length} 个资源");
                return Ok(mergedResourceInfos);
@@ -189,16 +170,7 @@ public class ResourceController : ControllerBase
                return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源列表失败: {result.Error.Message}");
            }

-            var resources = result.Value.Select(r => new ResourceInfo
-            {
-                ID = r.ID.ToString(),
-                Name = r.ResourceName,
-                Type = r.ResourceType,
-                Purpose = r.Purpose,
-                UploadTime = r.UploadTime,
-                ExamID = r.ExamID,
-                MimeType = r.MimeType
-            }).ToArray();
+            var resources = result.Value.Select(r => new ResourceInfo(r)).ToArray();

            logger.Info($"成功获取资源列表，共 {resources.Length} 个资源");
            return Ok(resources);
@@ -317,67 +289,77 @@ public class ResourceController : ControllerBase
            return StatusCode(StatusCodes.Status500InternalServerError, $"删除资源失败: {ex.Message}");
        }
    }
-
-    /// <summary>
-    /// 资源信息类
-    /// </summary>
-    public class ResourceInfo
-    {
-        /// <summary>
-        /// 资源ID
-        /// </summary>
-        public required string ID { get; set; }
-
-        /// <summary>
-        /// 资源名称
-        /// </summary>
-        public required string Name { get; set; }
-
-        /// <summary>
-        /// 资源类型
-        /// </summary>
-        public required string Type { get; set; }
-
-        /// <summary>
-        /// 资源用途（template/user）
-        /// </summary>
-        public required ResourcePurpose Purpose { get; set; }
-
-        /// <summary>
-        /// 上传时间
-        /// </summary>
-        public DateTime UploadTime { get; set; }
-
-        /// <summary>
-        /// 所属实验ID（可选）
-        /// </summary>
-        public string? ExamID { get; set; }
-
-        /// <summary>
-        /// MIME类型
-        /// </summary>
-        public string? MimeType { get; set; }
-    }
-
-    /// <summary>
-    /// 添加资源请求类
-    /// </summary>
-    public class AddResourceRequest
-    {
-        /// <summary>
-        /// 资源类型
-        /// </summary>
-        public required string ResourceType { get; set; }
-
-        /// <summary>
-        /// 资源用途（template/user）
-        /// </summary>
-        public required ResourcePurpose ResourcePurpose { get; set; }
-
-        /// <summary>
-        /// 所属实验ID（可选）
-        /// </summary>
-        public string? ExamID { get; set; }
-    }
-
+}
+
+/// <summary>
+/// 资源信息类
+/// </summary>
+public class ResourceInfo
+{
+    /// <summary>
+    /// 资源ID
+    /// </summary>
+    public string ID { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 资源名称
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 资源类型
+    /// </summary>
+    public string Type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 资源用途（template/user）
+    /// </summary>
+    public ResourcePurpose Purpose { get; set; }
+
+    /// <summary>
+    /// 上传时间
+    /// </summary>
+    public DateTime UploadTime { get; set; }
+
+    /// <summary>
+    /// 所属实验ID（可选）
+    /// </summary>
+    public string? ExamID { get; set; }
+
+    /// <summary>
+    /// MIME类型
+    /// </summary>
+    public string? MimeType { get; set; }
+
+    public ResourceInfo(Resource resource)
+    {
+        ID = resource.ID.ToString();
+        Name = resource.ResourceName;
+        Type = resource.ResourceType;
+        Purpose = resource.Purpose;
+        UploadTime = resource.UploadTime;
+        ExamID = resource.ExamID;
+        MimeType = resource.MimeType;
+    }
+}
+
+/// <summary>
+/// 添加资源请求类
+/// </summary>
+public class AddResourceRequest
+{
+    /// <summary>
+    /// 资源类型
+    /// </summary>
+    public required string ResourceType { get; set; }
+
+    /// <summary>
+    /// 资源用途（template/user）
+    /// </summary>
+    public required ResourcePurpose ResourcePurpose { get; set; }
+
+    /// <summary>
+    /// 所属实验ID（可选）
+    /// </summary>
+    public string? ExamID { get; set; }
 }