From 63041cd019b91e00eb346c67f17597ebb2e5def5 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 14:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=A8=A1=E5=9D=97=E8=AF=86=E5=88=AB=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E6=B2=A1=E6=9C=89=E5=86=99=E5=85=A5=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VideoAnalysis/appsettings.json | 3 +- .../AICore/GPT/GTP_Analysis_1.cs | 13 ++++++-- VideoAnalysisCore/Controllers/Dto/ApiDto.cs | 25 ++++++++------- .../Controllers/LJZK_Controller.cs | 31 ++++++++++++------- 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/VideoAnalysis/appsettings.json b/VideoAnalysis/appsettings.json index 3b73f57..79c114a 100644 --- a/VideoAnalysis/appsettings.json +++ b/VideoAnalysis/appsettings.json @@ -2,7 +2,8 @@ "Kestrel": { "Endpoints": { "Http": { - "Url": "http://*:7532" + //"Url": "http://*:7532" + "Url": "http://*:5238" } } }, diff --git a/VideoAnalysisCore/AICore/GPT/GTP_Analysis_1.cs b/VideoAnalysisCore/AICore/GPT/GTP_Analysis_1.cs index 3ac1c1c..6108915 100644 --- a/VideoAnalysisCore/AICore/GPT/GTP_Analysis_1.cs +++ b/VideoAnalysisCore/AICore/GPT/GTP_Analysis_1.cs @@ -28,6 +28,7 @@ using static System.Net.Mime.MediaTypeNames; using VideoAnalysisCore.AICore.GPT.DeepSeek; using VideoAnalysisCore.AICore.GPT.Gemini; using static System.Collections.Specialized.BitVector32; +using UserCenter.Model; namespace VideoAnalysisCore.AICore.GPT { @@ -520,6 +521,7 @@ namespace VideoAnalysisCore.AICore.GPT """; var res = await bset_deepSeekClient.ChatAsync(taskInfo.Id.ToString(), message, "作业布置识别", ChatGPTType.Deepseek_Chat, 8000); + //部分参数 没补全 if (res is null) return null; if (!string.Equals(res.Stage, "作业布置", StringComparison.OrdinalIgnoreCase)) @@ -845,8 +847,15 @@ namespace VideoAnalysisCore.AICore.GPT GradeYear = taskInfo.GradeYear, }).ToList(); //尝试追加 作业布置分段 - if (homework != null && !questionRes.Any(s => s.Stage == StageEnum.作业布置.ToString())) - tStage.Add(homework.Adapt()); + if (homework != null && !questionRes.Any(s => s.Stage == StageEnum.作业布置.ToString())) + { + var stag = homework.Adapt(); + stag.VideoTaskId = taskId; + stag.TagId = taskInfo.TagId; + stag.Stage = StageEnum.课程总结; + stag.CloudSchoolId = taskInfo.CloudSchoolId; + tStage.Add(stag); + } await videoTaskStageDB.InsertRangeAsync(tStage); await videoKonwPointDB.InsertRangeAsync(insertData); break; diff --git a/VideoAnalysisCore/Controllers/Dto/ApiDto.cs b/VideoAnalysisCore/Controllers/Dto/ApiDto.cs index c4f0b77..790b990 100644 --- a/VideoAnalysisCore/Controllers/Dto/ApiDto.cs +++ b/VideoAnalysisCore/Controllers/Dto/ApiDto.cs @@ -401,14 +401,14 @@ namespace VideoAnalysisCore.Controllers.Dto public class VideoTaskStageRes { - /// - /// 视频封面地址 - /// - public string PreviewUrl { get; set; } - /// - /// 视频地址 - /// - public string PlayUrl { get; set; } + ///// + ///// 视频封面地址 + ///// + //public string PreviewUrl { get; set; } + ///// + ///// 视频地址 + ///// + //public string PlayUrl { get; set; } /// /// id /// @@ -419,10 +419,13 @@ namespace VideoAnalysisCore.Controllers.Dto /// public long VideoTaskId { get; set; } /// - /// 自定义Id [任务视频自定义id] - /// + /// 年份 /// - public string? TagId { get; set; } + public string? GradeYear { get; set; } + /// + /// 年份 + /// + public GradeEnum? GradeId { get; set; } /// /// 开始时间 diff --git a/VideoAnalysisCore/Controllers/LJZK_Controller.cs b/VideoAnalysisCore/Controllers/LJZK_Controller.cs index a83c5ed..910a2a8 100644 --- a/VideoAnalysisCore/Controllers/LJZK_Controller.cs +++ b/VideoAnalysisCore/Controllers/LJZK_Controller.cs @@ -353,12 +353,13 @@ namespace VideoAnalysisCore.Controllers { Id = s.Id, VideoTaskId = s.VideoTaskId, - TagId = s.TagId, StartTime = s.StartTime, EndTime = s.EndTime, Theme = s.Theme, CloudSchoolId = s.CloudSchoolId, Stage=s.Stage, + GradeId = s.GradeId, + GradeYear = s.GradeYear?.ToString(), //PreviewUrl= videoInfoRes.ContainsKey(s.VideoTaskId.ToString())? videoInfoRes[] : KnowPoints = kpDic.ContainsKey(s.Id) ? kpDic[s.Id] : [] }).ToArray(); @@ -386,18 +387,26 @@ namespace VideoAnalysisCore.Controllers var task =await videoTaskDB.GetByIdAsync(videoTaskId); if (task is null) return BadRequest("Ч"); - - var videoInfo = await vodClient.GetPlayInfoAsync(new GetPlayInfoRequest() + try { - VideoId = task.TagId, - Formats = "mp4", - OutputType = "cdn", - AuthTimeout = 3600 * 24 * 12, - }); - if (videoInfo is null || videoInfo.StatusCode != 200 && !videoInfo.Body.PlayInfoList.PlayInfo.Any()) - return BadRequest("ȡ洢ƵϢʧ!"); + var videoInfo = await vodClient.GetPlayInfoAsync(new GetPlayInfoRequest() + { + VideoId = task.TagId, + Formats = "mp4", + OutputType = "cdn", + AuthTimeout = 3600 * 24 * 12, + }); + if (videoInfo is null || videoInfo.StatusCode != 200 && !videoInfo.Body.PlayInfoList.PlayInfo.Any()) + return BadRequest("ȡ洢ƵϢʧ!"); + return Ok(videoInfo.Body.PlayInfoList.PlayInfo.First().PlayURL); + + } + catch (Exception ex ) + { + + return BadRequest("ȡ洢ƵϢʧ!" + ex.Message); + } - return Ok(videoInfo.Body.PlayInfoList.PlayInfo.First().PlayURL); } }