diff --git a/Learn.VideoAnalysis.API/Program.cs b/Learn.VideoAnalysis.API/Program.cs index c0d1ead..aa97303 100644 --- a/Learn.VideoAnalysis.API/Program.cs +++ b/Learn.VideoAnalysis.API/Program.cs @@ -82,7 +82,7 @@ namespace Learn.VideoAnalysis.API app.UseSqlSugarExpand(); app.UseCoravelExpand(); // 注册启动后的回调 - app.UseServiceSystem(); + app.UseServiceSystem(null,false); app.Run(); diff --git a/VideoAnalysisCore/Common/Expand/ServiceSystem.cs b/VideoAnalysisCore/Common/Expand/ServiceSystem.cs index 0853d2d..0d20313 100644 --- a/VideoAnalysisCore/Common/Expand/ServiceSystem.cs +++ b/VideoAnalysisCore/Common/Expand/ServiceSystem.cs @@ -25,7 +25,8 @@ namespace VideoAnalysisCore.Common.Expand /// 系统服务 /// /// - public static void UseServiceSystem(this IHost app1,Action? action=null) + /// 打开浏览器? + public static void UseServiceSystem(this IHost app1,Action? action=null,bool openBrowser =true) { var app = app1.Services; // 注册启动后的回调 @@ -52,7 +53,7 @@ namespace VideoAnalysisCore.Common.Expand .Replace("+", "127.0.0.1"); var uri = new Uri(normalizedAddress); int port = uri.Port; // 这里的 port 就是你要的数字 (int) - if (OperatingSystem.IsWindows()) + if (openBrowser && OperatingSystem.IsWindows()) OpenBrowser($"http://localhost:{uri.Port}/ui/index.html"); if(action != null) action(); diff --git a/VideoAnalysisCore/Controllers/Dto/ApiDto.cs b/VideoAnalysisCore/Controllers/Dto/ApiDto.cs index 7258c9a..de2fa4c 100644 --- a/VideoAnalysisCore/Controllers/Dto/ApiDto.cs +++ b/VideoAnalysisCore/Controllers/Dto/ApiDto.cs @@ -447,6 +447,7 @@ namespace VideoAnalysisCore.Controllers.Dto /// 课程阶段 /// public virtual string? Stage { get; set; } + public virtual string? CourseLevel { get; set; } /// /// 视频所属云校ID /// 用户中心的云校id diff --git a/VideoAnalysisCore/Controllers/LJZK_Controller.cs b/VideoAnalysisCore/Controllers/LJZK_Controller.cs index 7c3624a..9bcdef7 100644 --- a/VideoAnalysisCore/Controllers/LJZK_Controller.cs +++ b/VideoAnalysisCore/Controllers/LJZK_Controller.cs @@ -311,6 +311,8 @@ namespace VideoAnalysisCore.Controllers stageQuery = stageQuery.WhereIF(!string.IsNullOrWhiteSpace(req.Theme), s => s.Theme.Contains(req.Theme)); stageQuery = stageQuery.WhereIF(!string.IsNullOrWhiteSpace(req.Content), s => s.Content.Contains(req.Content)); + //stageQuery = stageQuery.Where(s => s.Stage != StageEnum.γ); + var pageIndex = req.PageIndex < 0 ? 0 : req.PageIndex; var pageSize = req.PageSize <= 0 ? 50 : req.PageSize > 100 ? 100 : req.PageSize; string[]? knowArr = null; @@ -333,8 +335,8 @@ 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) - kpQuery = kpQuery.Where(s => knowArr.Contains(s.KnowPointId)); + //if (knowArr != null && knowArr.Length > 0) + // kpQuery = kpQuery.Where(s => knowArr.Contains(s.KnowPoint)); var kpArr = await kpQuery .Select(s => new { s.StageId, s.KnowPoint }) @@ -358,6 +360,7 @@ namespace VideoAnalysisCore.Controllers Theme = s.Theme, CloudSchoolId = s.CloudSchoolId, Stage = s.Stage.ToString(), + CourseLevel = ((ѧEnum)(int)(s.CourseLevel ??CourselevelTypeEnum.޲)).ToString(), GradeId = s.GradeId.ToString(), GradeYear = s.GradeYear?.ToString(), //PreviewUrl= videoInfoRes.ContainsKey(s.VideoTaskId.ToString())? videoInfoRes[] : diff --git a/VideoAnalysisCore/Model/Enum/CourselevelType.cs b/VideoAnalysisCore/Model/Enum/CourselevelType.cs index 471f3f4..6dd5458 100644 --- a/VideoAnalysisCore/Model/Enum/CourselevelType.cs +++ b/VideoAnalysisCore/Model/Enum/CourselevelType.cs @@ -16,4 +16,15 @@ namespace VideoAnalysisCore.Model.Enum 三层次 = 3, 无层次 = 10 } + + /// + /// 转换为课程层次 + /// + public enum 爱学蝶变层次Enum + { + PB = 1, + TK = 2, + BJ = 3, + 无 = 10 + } } diff --git a/VideoAnalysisCore/Model/VideoTaskStage.cs b/VideoAnalysisCore/Model/VideoTaskStage.cs index eef1b1b..6d78846 100644 --- a/VideoAnalysisCore/Model/VideoTaskStage.cs +++ b/VideoAnalysisCore/Model/VideoTaskStage.cs @@ -62,7 +62,7 @@ namespace VideoAnalysisCore.Model /// /// 课程阶段 /// - [SugarColumn(IsIgnore = true)] + [SugarColumn(IsNullable = true)] public virtual StageEnum? Stage { get; set; } /// /// 视频所属云校ID