diff --git a/VideoAnalysis/Controllers/ApiController.cs b/VideoAnalysis/Controllers/ApiController.cs
index cd6682e..9a9435d 100644
--- a/VideoAnalysis/Controllers/ApiController.cs
+++ b/VideoAnalysis/Controllers/ApiController.cs
@@ -17,6 +17,7 @@ using VideoAnalysisCore.AICore.SherpaOnnx;
using System.Net;
using System.Security.Policy;
using System.IO;
+using UserCenter.Model.Enum;
namespace Learn.VideoAnalysis.Controllers
{
@@ -113,9 +114,10 @@ namespace Learn.VideoAnalysis.Controllers
///
///
/// 自定义id
+ /// 切换任务所属学科 null忽略
///
[HttpGet(Name = "ReStart")]
- public async Task ReStart(long taskId, string? tagId)
+ public async Task ReStart(long taskId, string? tagId, SubjectEnum? subject)
{
var task = await videoTaskDB.AsQueryable()
.WhereIF(taskId != 0, s => s.Id == taskId)
@@ -123,6 +125,11 @@ namespace Learn.VideoAnalysis.Controllers
.FirstAsync();
if (task is null)
return BadRequest("未能找到对应任务");
+ if (subject is not null)
+ {
+ task.Subject = subject;
+ await videoTaskDB.UpdateAsync(task);
+ }
//重新开始执行GPT分析
RedisExpand.InsertChannel(RedisChannelEnum.ChatModelAnalysis
, task.Id);
@@ -137,6 +144,8 @@ namespace Learn.VideoAnalysis.Controllers
[HttpGet(Name = "TaskInfo")]
public async Task TaskInfo(long taskId,string? tagId)
{
+ if(taskId == 0 && string.IsNullOrEmpty(tagId))
+ return BadRequest();
var task = await videoTaskDB.AsQueryable()
.WhereIF(taskId!=0, s => s.Id == taskId)
.WhereIF(!string.IsNullOrEmpty(tagId), s => s.TagId == tagId)
diff --git a/VideoAnalysisCore/AICore/ChatGPT/Dto/CallGPTRes.cs b/VideoAnalysisCore/AICore/ChatGPT/Dto/CallGPTRes.cs
index 6f35b64..a060a55 100644
--- a/VideoAnalysisCore/AICore/ChatGPT/Dto/CallGPTRes.cs
+++ b/VideoAnalysisCore/AICore/ChatGPT/Dto/CallGPTRes.cs
@@ -63,8 +63,10 @@ namespace VideoAnalysisCore.AICore.ChatGPT.Dto
/// 婊″垎100
///
public float AssessmentScore =>
- (float)Math.Round((Assessment?.Bad?.Select(x => x.Score)
- .Concat(Assessment?.Merit?.Select(s => s.Score) ?? [])
- .Average() ?? 0) * 10,2);
+ (float)(Assessment?.Bad?.Sum(x => x.Score)??0 +
+ Assessment?.Merit?.Sum(x => x.Score) ?? 0);
+ //(float)Math.Round((Assessment?.Bad?.Select(x => x.Score)
+ //.Concat(Assessment?.Merit?.Select(s => s.Score) ?? [])
+ //.Average() ?? 0) * 10,2);
}
}