From 36f719370babe59527eecf68e48e34c2cd55cca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Fri, 17 Apr 2026 18:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=87=E7=89=87=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoAnalysisCore/Controllers/Dto/ApiDto.cs   |  4 +-
 .../Controllers/LJZK_Controller.cs            | 38 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/VideoAnalysisCore/Controllers/Dto/ApiDto.cs b/VideoAnalysisCore/Controllers/Dto/ApiDto.cs
index 790b990..7258c9a 100644
--- a/VideoAnalysisCore/Controllers/Dto/ApiDto.cs
+++ b/VideoAnalysisCore/Controllers/Dto/ApiDto.cs
@@ -425,7 +425,7 @@ namespace VideoAnalysisCore.Controllers.Dto
         /// <summary>
         /// 年份
         /// </summary>
-        public GradeEnum? GradeId { get; set; }
+        public string? GradeId { get; set; }
 
         /// <summary>
         /// 开始时间
@@ -446,7 +446,7 @@ namespace VideoAnalysisCore.Controllers.Dto
         /// <summary>
         /// 课程阶段
         /// </summary>
-        public virtual StageEnum? Stage { get; set; }
+        public virtual string? Stage { get; set; }
         /// <summary>
         /// 视频所属云校ID
         /// <para><see cref="UserCenter.Model.CloudSchool"/> 用户中心的云校id</para>
diff --git a/VideoAnalysisCore/Controllers/LJZK_Controller.cs b/VideoAnalysisCore/Controllers/LJZK_Controller.cs
index 910a2a8..7c3624a 100644
--- a/VideoAnalysisCore/Controllers/LJZK_Controller.cs
+++ b/VideoAnalysisCore/Controllers/LJZK_Controller.cs
@@ -123,12 +123,12 @@ namespace VideoAnalysisCore.Controllers
                     VideoUrl = s.VideoUrl,
                     CourseType = s.CourseType,
                     CallBackUrl = s.CallBackUrl,
-                    CloudSchoolId =s.UserCenterCloudSchoolId,
+                    CloudSchoolId = s.UserCenterCloudSchoolId,
                     Area = s.Area,
                     HostIP = s.HostIP,
                     StageId = s.StageId,
                     GradeId = s.GradeId,
-                    GradeYear = s.Trem==0?null : s.Trem,
+                    GradeYear = s.Trem == 0 ? null : s.Trem,
                     GradeSemester = s.GradeSemester,
                     TextBookVersionId = s.TextBookVersionId,
                 };
@@ -151,8 +151,8 @@ namespace VideoAnalysisCore.Controllers
                     VideoType = s.CourseType,
                     CloudSchoolId = s.UserCenterCloudSchoolId,
                     TextBookVersionId = s.TextBookVersionId,
-                    GradeSemester =s .GradeSemester,
-                    CourseLevel =s.CourseLevel,
+                    GradeSemester = s.GradeSemester,
+                    CourseLevel = s.CourseLevel,
                     GradeId = s.GradeId,
                     GradeYear = np.GradeYear,
                 });
@@ -207,7 +207,7 @@ namespace VideoAnalysisCore.Controllers
         /// <param name="taskId">×Ô¶¨Òåid</param>
         /// <returns></returns>
         [HttpGet(Name = "TaskKnowInfo")]
-        public async Task<IActionResult> TaskKnowInfo(string? tagId , string? taskId)
+        public async Task<IActionResult> TaskKnowInfo(string? tagId, string? taskId)
         {
             if (string.IsNullOrEmpty(tagId) && !string.IsNullOrEmpty(taskId))
                 tagId = taskId;
@@ -261,12 +261,12 @@ namespace VideoAnalysisCore.Controllers
                     Theme = s.Theme,
                     Know = videoKnowDic.ContainsKey(s.Id)
                     ? videoKnowDic[s.Id]?.Select(x => new TaskKnowInfo()
-                        {
-                            Id = x.Id,
-                            KnowPoint = x.KnowPoint,
-                            KnowPointId = x.KnowPointId,
-                            KnowWeight = x.KnowPointWeight??0f,
-                        })?.ToArray()
+                    {
+                        Id = x.Id,
+                        KnowPoint = x.KnowPoint,
+                        KnowPointId = x.KnowPointId,
+                        KnowWeight = x.KnowPointWeight ?? 0f,
+                    })?.ToArray()
                     : null
                 }).ToArray()
             };
@@ -312,11 +312,11 @@ namespace VideoAnalysisCore.Controllers
             stageQuery = stageQuery.WhereIF(!string.IsNullOrWhiteSpace(req.Content), s => s.Content.Contains(req.Content));
 
             var pageIndex = req.PageIndex < 0 ? 0 : req.PageIndex;
-            var pageSize = req.PageSize <= 0 ? 50 : req.PageSize > 100 ?100 : req.PageSize;
+            var pageSize = req.PageSize <= 0 ? 50 : req.PageSize > 100 ? 100 : req.PageSize;
             string[]? knowArr = null;
             if (req.KnowPointStrArr is not null && req.KnowPointStrArr.Length > 0)
             {
-                knowArr = req.KnowPointStrArr.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s=>s.Trim()).Distinct().ToArray();
+                knowArr = req.KnowPointStrArr.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim()).Distinct().ToArray();
                 if (knowArr.Length > 0)
                 {
                     stageQuery = stageQuery.Where(s => SqlFunc.Subqueryable<VideoKonwPoint>()
@@ -333,7 +333,7 @@ namespace VideoAnalysisCore.Controllers
             var taskIdArr = stagePageArr.Select(s => s.VideoTaskId).ToArray();
             var kpQuery = videoKonwPointDB.AsQueryable()
                 .Where(s => taskIdArr.Contains(s.VideoTaskId) && s.KnowPointId != null);
-            if (knowArr !=null && knowArr.Length > 0)
+            if (knowArr != null && knowArr.Length > 0)
                 kpQuery = kpQuery.Where(s => knowArr.Contains(s.KnowPointId));
 
             var kpArr = await kpQuery
@@ -357,8 +357,8 @@ namespace VideoAnalysisCore.Controllers
                 EndTime = s.EndTime,
                 Theme = s.Theme,
                 CloudSchoolId = s.CloudSchoolId,
-                Stage=s.Stage,
-                GradeId = s.GradeId,
+                Stage = s.Stage.ToString(),
+                GradeId = s.GradeId.ToString(),
                 GradeYear = s.GradeYear?.ToString(),
                 //PreviewUrl= videoInfoRes.ContainsKey(s.VideoTaskId.ToString())? videoInfoRes[] :
                 KnowPoints = kpDic.ContainsKey(s.Id) ? kpDic[s.Id] : []
@@ -382,9 +382,9 @@ namespace VideoAnalysisCore.Controllers
         [HttpGet(Name = "GetVideoURL")]
         public async Task<IActionResult> GetVideoURL(long videoTaskId)
         {
-            if (videoTaskId ==0)
+            if (videoTaskId == 0)
                 return BadRequest("²ÎÊý²»ÄÜΪ¿Õ");
-            var task =await videoTaskDB.GetByIdAsync(videoTaskId);
+            var task = await videoTaskDB.GetByIdAsync(videoTaskId);
             if (task is null)
                 return BadRequest("²ÎÊýÎÞЧ");
             try
@@ -401,7 +401,7 @@ namespace VideoAnalysisCore.Controllers
                 return Ok(videoInfo.Body.PlayInfoList.PlayInfo.First().PlayURL);
 
             }
-            catch (Exception ex )
+            catch (Exception ex)
             {
 
                 return BadRequest("»ñÈ¡´æ´¢µÄÊÓƵÐÅϢʧ°Ü!" + ex.Message);