From 4d146d718bd6b3f8ef2b50950389b422cb8c771a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Wed, 4 Dec 2024 12:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=BB=BB=E5=8A=A1=20=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=A7=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoAnalysis/Controllers/ApiController.cs         | 11 ++++++++++-
 VideoAnalysisCore/AICore/ChatGPT/Dto/CallGPTRes.cs |  8 +++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

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
         /// </summary>
         /// <param name="taskId"></param>
         /// <param name="tagId">自定义id</param>
+        /// <param name="subject">切换任务所属学科 null忽略</param>
         /// <returns></returns>
         [HttpGet(Name = "ReStart")]
-        public async Task<IActionResult> ReStart(long taskId, string? tagId)
+        public async Task<IActionResult> 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<IActionResult> 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
         /// <para>婊″垎100</para>
         /// </summary>
         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);
     }
 }