Learn.VideoAnalysis.API/Program.cs

@@ -48,11 +48,12 @@ namespace Learn.VideoAnalysis.API
 
             var app = builder.Build();
             AppCommon.Services = app.Services;
-            app.UseMiddleware<BasicAuthMiddleware>("Swagger");
             // Configure the HTTP request pipeline.
-
+            if (app.Environment.IsDevelopment())
+            {
                 app.UseSwagger();
                 app.UseSwaggerUI();
+            }
 
             app.UseHttpsRedirection();
 

Learn.VideoAnalysis.API/appsettings.json

@@ -22,11 +22,6 @@
         "Token": ""
       }
     },
-    "SimpLetex": {
-      "Host": "https://server.simpletex.cn/api/",
-      "AppSecret": "05ZbPfCFZgTmfd4uIqHHc9pHgYR2V8bk",
-      "AppId": "GH2OXwuxSZEH5W28H61bdSzD"
-    },
     "Redis": {
       "ConnectionString": "127.0.0.1:6379,password=Woshiren123,defaultDatabase=10"
     },
@@ -65,14 +60,6 @@
       "AccessKeySecret": "vRKgmbp1LB05LaGOjh3ZrZxbHSLYLF",
       "EndPoint": "vod.cn-shanghai.aliyuncs.com" //上传节点
     },
-    "AliyunOSS": {
-      "AccessKeyId": "LTAI5tDC6p9h747B7FHbgwkH",
-      "AccessKeySecret": "vRKgmbp1LB05LaGOjh3ZrZxbHSLYLF",
-      "BucketDomain": "https://learn-videoanalysis.oss-cn-chengdu.aliyuncs.com",
-      "Region": "cn-chengdu",
-      "BucketName": "learn-videoanalysis",
-      "EndPoint": "oss-cn-chengdu.aliyuncs.com" //上传节点
-    },
     "OtherDBArr": [
       {
         "ConfigId": 1001, //ResourceBank

VideoAnalysis/Program.cs

@@ -118,11 +118,12 @@ namespace Learn.VideoAnalysis
             app.UseMiddleware<BasicAuthMiddleware>("Swagger");
 
             // Configure the HTTP request pipeline.
-
+            if (app.Environment.IsDevelopment())
+            {
                 app.UseSwagger();
                 app.UseSwaggerUI();
                 app.UseExceptionHandler("/Error");
-
+            }
             //Ìí¼Ówwwroot ¾²Ì¬Ä¿Â¼
             app.UseStaticFiles();
             //Ìí¼Ó ×Ô¶¨Òå ¾²Ì¬Ä¿Â¼

VideoAnalysisCore/AICore/GPT/DeepSeek/DeepSeek_GPT.cs

@@ -197,7 +197,7 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
             var totalCount = captionsArr.Length / spanCount + 1;
 
             await Parallel.ForAsync(0, totalCount,
-                new ParallelOptions() { MaxDegreeOfParallelism = 20 },
+                new ParallelOptions() { MaxDegreeOfParallelism = 10 },
                 async (s, c) =>
             {
                 while (true)
@@ -285,9 +285,6 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
                                $"字幕列表 {captions.Captions} 字幕结束!";
                             break;
                         case AttachmentsInfoType.复习:
-
-
-
                             postMessages =
                                $"请通过视频字幕内容分析出视频中课堂的授课阶段。" +
                                $"课堂内容与{taskInfo.Subject}学科下的{sections}章节相关。" +
@@ -322,7 +319,7 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
         }
 
         /// <summary>
-        /// 请求AI
+        /// 
         /// </summary>
         /// <typeparam name="T">返回JSON类型</typeparam>
         /// <param name="task">任务id</param>

VideoAnalysisCore/Common/RedisExpand.cs

@@ -184,7 +184,7 @@ namespace VideoAnalysisCore.Common
             }
             catch (Exception ex)
             {
-                await SetTaskErrorMessage(long.Parse(tId), ex);
+                await SetTaskErrorMessage((long)taskId, ex);
             }
         }
 

VideoAnalysisCore/Controllers/Dto/ApiDto.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations;
 using UserCenter.Model.Enum;
 using VideoAnalysisCore.AICore.GPT.Dto;
-using VideoAnalysisCore.Model.Dto;
 using VideoAnalysisCore.Model.Enum;
 
 namespace VideoAnalysisCore.Controllers.Dto
@@ -229,10 +228,6 @@ namespace VideoAnalysisCore.Controllers.Dto
     public class TaskKnowBlock
     {
         public long Id { get; set; }
-        /// <summary>
-        /// 阶段id
-        /// </summary>
-        public long StageId { get; set; }
 
         /// <summary>
         /// 开始时间
@@ -259,11 +254,6 @@ namespace VideoAnalysisCore.Controllers.Dto
         /// 知识点列表
         /// </summary>
         public TaskKnowInfo[] Know { get; set; }
-
-        /// <summary>
-        /// 片段内的试题
-        /// </summary>
-        public virtual VideoQuestionShowDto[]? QuestionArr { get; set; }
     }
     /// <summary>
     /// 视频片段知识点结果
@@ -284,7 +274,7 @@ namespace VideoAnalysisCore.Controllers.Dto
         /// </summary>
         public long VideoTaskId { get; set; }
         /// <summary>
-        /// 视频片段
+        /// 视频知识快
         /// </summary>
         public TaskKnowBlock[] KnowBlockArr { get; set; }
 

VideoAnalysisCore/Controllers/LJZK_Controller.cs

@@ -18,7 +18,6 @@ using Yitter.IdGenerator;
 using VideoAnalysisCore.AICore.GPT.Dto;
 using VideoAnalysisCore.Model;
 using VideoAnalysisCore.Controllers.Dto;
-using VideoAnalysisCore.Model.Dto;
 
 namespace VideoAnalysisCore.Controllers
 {
@@ -34,20 +33,15 @@ namespace VideoAnalysisCore.Controllers
         private readonly Repository<VideoTask> videoTaskDB;
         private readonly Repository<VideoKonwPoint> videoKonwPointDB;
         private readonly Repository<NodePackageInfo> nodePackageInfoDB;
-        private readonly Repository<VideoQuestion> videoQuestionDB;
+        public LJZK_Controller( IMapper mp, Repository<NodeSubscription> nodesubscriptionDB,
-        private readonly Repository<VideoQuestionKonw> videoQuestionKonwDB;
-
-        public LJZK_Controller(IMapper mp, Repository<NodeSubscription> nodesubscriptionDB,
             Repository<VideoTask> videoTaskDB = null, Repository<VideoKonwPoint> videoKonwPointDB = null
-            , Repository<NodePackageInfo> nodePackageInfoDB = null, Repository<VideoQuestion> videoQuestionDB = null, Repository<VideoQuestionKonw> videoQuestionKonwDB = null)
+            , Repository<NodePackageInfo> nodePackageInfoDB = null)
         {
             this.mp = mp;
             this.nodesubscriptionDB = nodesubscriptionDB;
             this.videoTaskDB = videoTaskDB;
             this.videoKonwPointDB = videoKonwPointDB;
             this.nodePackageInfoDB = nodePackageInfoDB;
-            this.videoQuestionDB = videoQuestionDB;
-            this.videoQuestionKonwDB = videoQuestionKonwDB;
         }
 
 
@@ -66,12 +60,10 @@ namespace VideoAnalysisCore.Controllers
             var videos = new List<VideoTask>(reqArr.Count());
             var nodePackages = new List<NodePackageInfo>(reqArr.Count());
             var videoIdArr = videoTaskDB.AsQueryable().Select(v => v.TagId).Distinct().ToArray();
-            foreach (var sGroup in reqArr.GroupBy(s => s.ContentId))
+            foreach (var sGroup in reqArr.GroupBy(s=>s.ContentId))
             {
-                var s = sGroup.FirstOrDefault(s => s.VideoType == VideoType.摄像头);
+                var  s= sGroup.First(s=>s.VideoType==VideoType.ÉãÏñÍ·);
-                if (s is null)
+                var  sPPT= sGroup.FirstOrDefault(s=>s.VideoType==VideoType.PPT¿Î¼þ);
-                    return BadRequest("无有效的老师授课视频");
-                var sPPT = sGroup.FirstOrDefault(s => s.VideoType == VideoType.PPT课件);
                 var np = new NodePackageInfo()
                 {
                     VideoCode = s.VideoCode,
@@ -80,16 +72,16 @@ namespace VideoAnalysisCore.Controllers
                     Stage = s.StageId,
                     CourseId = s.CourseId,
                     SubjectType = s.SubjectId,
-                    VideoUrl = s.VideoUrl,
+                    VideoUrl =s.VideoUrl,
                     CourseType = s.CourseType,
-                    CallBackUrl = s.CallBackUrl,
+                    CallBackUrl=s.CallBackUrl,
                     Area = s.Area,
                     HostIP = s.HostIP,
                 };
                 nodePackages.Add(np);
                 if (videoIdArr.Contains(s.VideoCode))
                     continue;
-                var pptCode = sPPT != null ? sPPT.VideoCode : string.Empty;
+                var pptCode = sPPT!=null ? sPPT.VideoCode : string.Empty;
                 videos.Add(new VideoTask()
                 {
                     Id = YitIdHelper.NextId(),
@@ -99,9 +91,9 @@ namespace VideoAnalysisCore.Controllers
                     CourseId = s.CourseId,
                     Subject = s.SubjectId,
                     TagId = s.VideoCode,
-                    MediaUrl = s.VideoUrl,
+                    MediaUrl =s.VideoUrl,
                     PPTVideoCode = pptCode,
-                    VideoType = s.CourseType
+                    VideoType =s.CourseType
                 });
             }
             await nodePackageInfoDB.InsertRangeAsync(nodePackages);
@@ -134,7 +126,6 @@ namespace VideoAnalysisCore.Controllers
             return Ok(Enum.GetValues(type).Cast<object>()
                 .Select(s => new { Text = s.ToString(), Value = (int)s }));
         }
-
         /// <summary>
         /// 获取学科类型
         /// </summary>
@@ -155,12 +146,12 @@ namespace VideoAnalysisCore.Controllers
         [HttpGet(Name = "TaskKnowInfo")]
         public async Task<IActionResult> TaskKnowInfo(string? tagId)
         {
-            if (string.IsNullOrEmpty(tagId))
+            if ( string.IsNullOrEmpty(tagId))
                 return BadRequest();
             long taskId = 0;
-            var taskIdOK = long.TryParse(tagId, out taskId);
+            var taskIdOK = long.TryParse(tagId,out taskId);
             var task = await videoTaskDB.AsQueryable()
-                .Where(s => s.TagId == tagId || s.PPTVideoCode == tagId || (taskIdOK && s.Id == taskId))
+                .Where(s=> s.TagId == tagId || s.PPTVideoCode== tagId || (taskIdOK&& s.Id == taskId))
                 .FirstAsync();
             if (task is null)
                 return BadRequest("无效任务");
@@ -170,7 +161,7 @@ namespace VideoAnalysisCore.Controllers
                 .ToArrayAsync();
             if (konwArr is null || konwArr.Length == 0)
                 return BadRequest("无效任务");
-            var res = new TaskKnowRes()
+            return Ok(new TaskKnowRes()
             {
                 TagId = task.TagId,
                 Status = task.LastEnum,
@@ -182,7 +173,6 @@ namespace VideoAnalysisCore.Controllers
                     Id = s.First().Id,
                     Content = s.First().Content,
                     StartTime = s.First().StartTime,
-                    StageId = s.First().StageId,
                     EndTime = s.First().EndTime,
                     Theme = s.First().Theme,
                     Know = s.Select(x => new TaskKnowInfo()
@@ -192,25 +182,7 @@ namespace VideoAnalysisCore.Controllers
                         KnowPointId = x.KnowPointId
                     }).ToArray()
                 }).ToArray()
-            };
+            });
-            if (task.VideoType == AttachmentsInfoType.复习)
-            {
-                var questionArr = await videoQuestionDB
-                    .AsQueryable().Where(s => s.VideoTaskId == task.Id)
-                    .Select<VideoQuestionShowDto>()
-                    .ToArrayAsync();
-
-                var konwDic = (await videoQuestionKonwDB
-                    .AsQueryable().Where(s => s.VideoTaskId == task.Id)
-                    .ToArrayAsync()).GroupBy(s => s.VideoQuestionId)
-                    .ToDictionary(s => s.Key);
-                foreach (var item in questionArr.Where(s => konwDic.ContainsKey(s.Id)))
-                    item.KonwArr = konwDic[item.Id].ToArray();
-                foreach (var item in res.KnowBlockArr)
-                    item.QuestionArr = questionArr
-                        .Where(s => s.StageId == item.StageId).ToArray();
-            }
-            return Ok(res);
         }