修复 作业识别模块识别成功后没有写入成功
This commit is contained in:
parent
de3bd90822
commit
63041cd019
|
|
@ -2,7 +2,8 @@
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
"Endpoints": {
|
||||||
"Http": {
|
"Http": {
|
||||||
"Url": "http://*:7532"
|
//"Url": "http://*:7532"
|
||||||
|
"Url": "http://*:5238"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ using static System.Net.Mime.MediaTypeNames;
|
||||||
using VideoAnalysisCore.AICore.GPT.DeepSeek;
|
using VideoAnalysisCore.AICore.GPT.DeepSeek;
|
||||||
using VideoAnalysisCore.AICore.GPT.Gemini;
|
using VideoAnalysisCore.AICore.GPT.Gemini;
|
||||||
using static System.Collections.Specialized.BitVector32;
|
using static System.Collections.Specialized.BitVector32;
|
||||||
|
using UserCenter.Model;
|
||||||
|
|
||||||
namespace VideoAnalysisCore.AICore.GPT
|
namespace VideoAnalysisCore.AICore.GPT
|
||||||
{
|
{
|
||||||
|
|
@ -520,6 +521,7 @@ namespace VideoAnalysisCore.AICore.GPT
|
||||||
""";
|
""";
|
||||||
|
|
||||||
var res = await bset_deepSeekClient.ChatAsync<VideoKnowRes>(taskInfo.Id.ToString(), message, "作业布置识别", ChatGPTType.Deepseek_Chat, 8000);
|
var res = await bset_deepSeekClient.ChatAsync<VideoKnowRes>(taskInfo.Id.ToString(), message, "作业布置识别", ChatGPTType.Deepseek_Chat, 8000);
|
||||||
|
//部分参数 没补全
|
||||||
if (res is null)
|
if (res is null)
|
||||||
return null;
|
return null;
|
||||||
if (!string.Equals(res.Stage, "作业布置", StringComparison.OrdinalIgnoreCase))
|
if (!string.Equals(res.Stage, "作业布置", StringComparison.OrdinalIgnoreCase))
|
||||||
|
|
@ -846,7 +848,14 @@ namespace VideoAnalysisCore.AICore.GPT
|
||||||
}).ToList();
|
}).ToList();
|
||||||
//尝试追加 作业布置分段
|
//尝试追加 作业布置分段
|
||||||
if (homework != null && !questionRes.Any(s => s.Stage == StageEnum.作业布置.ToString()))
|
if (homework != null && !questionRes.Any(s => s.Stage == StageEnum.作业布置.ToString()))
|
||||||
tStage.Add(homework.Adapt<VideoTaskStage>());
|
{
|
||||||
|
var stag = homework.Adapt<VideoTaskStage>();
|
||||||
|
stag.VideoTaskId = taskId;
|
||||||
|
stag.TagId = taskInfo.TagId;
|
||||||
|
stag.Stage = StageEnum.课程总结;
|
||||||
|
stag.CloudSchoolId = taskInfo.CloudSchoolId;
|
||||||
|
tStage.Add(stag);
|
||||||
|
}
|
||||||
await videoTaskStageDB.InsertRangeAsync(tStage);
|
await videoTaskStageDB.InsertRangeAsync(tStage);
|
||||||
await videoKonwPointDB.InsertRangeAsync(insertData);
|
await videoKonwPointDB.InsertRangeAsync(insertData);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -401,14 +401,14 @@ namespace VideoAnalysisCore.Controllers.Dto
|
||||||
public class VideoTaskStageRes
|
public class VideoTaskStageRes
|
||||||
{
|
{
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// 视频封面地址
|
///// 视频封面地址
|
||||||
/// </summary>
|
///// </summary>
|
||||||
public string PreviewUrl { get; set; }
|
//public string PreviewUrl { get; set; }
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// 视频地址
|
///// 视频地址
|
||||||
/// </summary>
|
///// </summary>
|
||||||
public string PlayUrl { get; set; }
|
//public string PlayUrl { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// id
|
/// id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -419,10 +419,13 @@ namespace VideoAnalysisCore.Controllers.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public long VideoTaskId { get; set; }
|
public long VideoTaskId { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义Id [任务视频自定义id]
|
/// 年份
|
||||||
/// <see cref="VideoTask.TagId"/>
|
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? TagId { get; set; }
|
public string? GradeYear { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 年份
|
||||||
|
/// </summary>
|
||||||
|
public GradeEnum? GradeId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开始时间
|
/// 开始时间
|
||||||
|
|
|
||||||
|
|
@ -353,12 +353,13 @@ namespace VideoAnalysisCore.Controllers
|
||||||
{
|
{
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
VideoTaskId = s.VideoTaskId,
|
VideoTaskId = s.VideoTaskId,
|
||||||
TagId = s.TagId,
|
|
||||||
StartTime = s.StartTime,
|
StartTime = s.StartTime,
|
||||||
EndTime = s.EndTime,
|
EndTime = s.EndTime,
|
||||||
Theme = s.Theme,
|
Theme = s.Theme,
|
||||||
CloudSchoolId = s.CloudSchoolId,
|
CloudSchoolId = s.CloudSchoolId,
|
||||||
Stage=s.Stage,
|
Stage=s.Stage,
|
||||||
|
GradeId = s.GradeId,
|
||||||
|
GradeYear = s.GradeYear?.ToString(),
|
||||||
//PreviewUrl= videoInfoRes.ContainsKey(s.VideoTaskId.ToString())? videoInfoRes[] :
|
//PreviewUrl= videoInfoRes.ContainsKey(s.VideoTaskId.ToString())? videoInfoRes[] :
|
||||||
KnowPoints = kpDic.ContainsKey(s.Id) ? kpDic[s.Id] : []
|
KnowPoints = kpDic.ContainsKey(s.Id) ? kpDic[s.Id] : []
|
||||||
}).ToArray();
|
}).ToArray();
|
||||||
|
|
@ -386,18 +387,26 @@ namespace VideoAnalysisCore.Controllers
|
||||||
var task =await videoTaskDB.GetByIdAsync(videoTaskId);
|
var task =await videoTaskDB.GetByIdAsync(videoTaskId);
|
||||||
if (task is null)
|
if (task is null)
|
||||||
return BadRequest("²ÎÊýÎÞЧ");
|
return BadRequest("²ÎÊýÎÞЧ");
|
||||||
|
try
|
||||||
var videoInfo = await vodClient.GetPlayInfoAsync(new GetPlayInfoRequest()
|
|
||||||
{
|
{
|
||||||
VideoId = task.TagId,
|
var videoInfo = await vodClient.GetPlayInfoAsync(new GetPlayInfoRequest()
|
||||||
Formats = "mp4",
|
{
|
||||||
OutputType = "cdn",
|
VideoId = task.TagId,
|
||||||
AuthTimeout = 3600 * 24 * 12,
|
Formats = "mp4",
|
||||||
});
|
OutputType = "cdn",
|
||||||
if (videoInfo is null || videoInfo.StatusCode != 200 && !videoInfo.Body.PlayInfoList.PlayInfo.Any())
|
AuthTimeout = 3600 * 24 * 12,
|
||||||
return BadRequest("获取存储的视频信息失败!");
|
});
|
||||||
|
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue